]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into update-progress
authorMichael Gapczynski <mtgap@owncloud.com>
Sat, 5 Jan 2013 17:24:21 +0000 (12:24 -0500)
committerMichael Gapczynski <mtgap@owncloud.com>
Sat, 5 Jan 2013 17:24:21 +0000 (12:24 -0500)
1  2 
lib/app.php

diff --cc lib/app.php
index 9d4ead71b90075792a5fb04e7989d2f2c573dca6,30f76300365f54cca5dd785e5925ea6b6fe30f0b..e60bce2a201e9c775f103daf96b7e455c425c874
mode 100755,100644..100644