Joas Schilling 2652c42958 Merge branch 'issue/225-sharing-extension-moved' ... Conflicts: appinfo/app.php appinfo/application.php tests/applicationtest.php		2015-02-18 14:54:45 +01:00
..
files.php	…
files_sharing.php	…