server/apps/files
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
..
ajax adding space between) and { 2012-09-07 15:22:01 +02:00
appinfo adding space between) and { 2012-09-07 15:22:01 +02:00
css upload button improvement, better separation, fix wrap issue 2012-08-27 14:05:18 -07:00
js Merge branch 'master' into routing 2012-09-07 15:51:44 +02:00
l10n [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
templates Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
admin.php adding space between) and { 2012-09-07 15:22:01 +02:00
download.php adding space between) and { 2012-09-07 15:22:01 +02:00
index.php Merge branch 'master' into routing 2012-09-07 15:51:44 +02:00
settings.php adding space between) and { 2012-09-07 15:22:01 +02:00