Merge branch 'rav/SPEC-254' into rav/flatten_sync

Browse source

Conflicts:
	api/client-server/v2_alpha/definitions/event.json
	api/client-server/v2_alpha/sync.yaml

...

This commit is contained in:

Richard van der Hoff 2015-11-16 16:52:43 +00:00

parent e1b12a753e 8316881393

commit 58b7901b51

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available