server/core
kondou 0ce35af02a Merge branch 'master' into improve_app-management
Conflicts:
	settings/js/apps.js
2013-08-21 19:20:25 +02:00
..
ajax Merge pull request #4271 from owncloud/plural_translations 2013-08-08 10:34:28 -07:00
css Merge branch 'master' into improve_app-management 2013-08-21 19:20:25 +02:00
doc fix difference between packaged version and master 2013-08-17 10:33:11 +02:00
img use proper password icon, three dots are 'more' 2013-08-16 17:59:48 +02:00
js Merge pull request #4262 from owncloud/fix_jslint_kondou 2013-08-20 12:45:10 -07:00
l10n [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
lostpassword Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
templates adding file templates for ods, odt and odp 2013-08-18 21:11:11 +02:00
minimizer.php adding space between) and { 2012-09-07 15:22:01 +02:00
routes.php Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
setup.php Suppress the notice from the nullbyte check 2013-04-09 21:11:44 +02:00
strings.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00