Merge branch 'release' into develop

Conflicts:
	manifest.appcache
This commit is contained in:
Manuel Friedli 2015-01-18 16:52:08 +01:00
commit c1a17a315d

View file

@ -1 +1 @@
7.0-next 8.0.0-dev.0