kondou e5fc7b9dbe Merge branch 'master' into clean_up_util ... Conflicts: lib/base.php		2013-09-02 07:58:06 +02:00
..
ajax	Merge master into oc_preview	2013-08-30 18:11:18 +02:00
css	rename emptyfolder to emptycontent	2013-08-31 11:25:11 -04:00
doc	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
img	Merge master into oc_preview	2013-08-19 11:24:17 +02:00
js	Merge pull request #4618 from owncloud/visualize-js	2013-08-28 14:17:50 -07:00
l10n	[tx-robot] updated from transifex	2013-09-01 13:30:40 -04:00
lostpassword	Merge branch 'master' into clean_up_util	2013-08-20 17:20:30 +02:00
templates	Apps management as sticky footer and rename to 'Apps', fix #4622	2013-08-30 11:17:31 +02:00
minimizer.php	Clean up \OC\Util	2013-08-15 15:57:32 +02:00
routes.php	outsource sharing and deleted files previews to apps	2013-08-19 13:24:07 +02:00
setup.php	Fix some naming and spacing in lib/util.php	2013-08-18 10:33:09 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00