Federico Kunze 5a3d514ba0 conflicts		2021-04-17 12:00:07 +02:00
..
annotations.proto	stargate: proto files (#679)	2021-01-07 18:45:32 -03:00
http.proto	conflicts	2021-04-17 12:00:07 +02:00
httpbody.proto	stargate: proto files (#679)	2021-01-07 18:45:32 -03:00