]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into implement_712
authorLukas Reschke <lukas@statuscode.ch>
Thu, 11 Aug 2016 17:37:17 +0000 (19:37 +0200)
committerLukas Reschke <lukas@statuscode.ch>
Thu, 11 Aug 2016 17:37:17 +0000 (19:37 +0200)
1  2 
apps/theming/appinfo/app.php
lib/private/legacy/app.php
version.php

Simple merge
Simple merge
diff --cc version.php
Simple merge