aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/internal/well_known_types.py
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-4/+11
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-3/+7
* Merge from google internalJisi Liu2017-10-181-2/+32
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-4/+24
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-2/+2
* Integrate internal changesBo Yang2016-10-101-7/+68
* Down integrate from Google internal.Jisi Liu2016-04-281-2/+6
* Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-291-2/+100
* Down-integrate from internal code base.Feng Xiao2015-12-111-0/+622