aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/json_format_proto3.proto
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-2/+2
* Fix bug: whether always_print_enums_as_ints is true or false, it always print...stone47742018-03-191-0/+6
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-0/+2
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+5
* Down-integrate from internal code base.Feng Xiao2015-12-111-0/+9
* Down-integrate from google internal.Jisi Liu2015-10-051-0/+10
* Down-integrate from internal code base.Feng Xiao2015-06-151-0/+157