nextcloud/core
Jörn Friedrich Dreyer 7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
..
ajax Merge master into oc_preview 2013-08-30 18:11:18 +02:00
avatar Remove superfluous $ 2013-09-14 14:15:52 +02:00
css Merge pull request #4835 from owncloud/fix-apps-height 2013-09-15 07:08:50 -07:00
doc fix difference between packaged version and master 2013-08-17 10:33:11 +02:00
img Optimize triangle-e.png and triangle-e.svg 2013-09-08 15:18:23 +02:00
js Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-19 17:00:54 +02:00
l10n [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
lostpassword Merge branch 'master' into rename-lostpassword-controller 2013-09-04 20:46:32 +02:00
templates Bring another enable_avatars to $_ and fix $thus->$this 2013-09-11 07:11:33 +02:00
minimizer.php Clean up \OC\Util 2013-08-15 15:57:32 +02:00
routes.php Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +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