nextcloud-server/apps/files/templates
Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update

Conflicts:
	lib/util.php
2013-09-05 13:39:45 +02:00
..
admin.php
index.php Merge branch 'master' into sharing_mail_notification_master 2013-09-05 13:39:45 +02:00
part.breadcrumb.php Migrate to encodePath 2013-07-09 17:46:11 +03:00
part.list.php Merge master into oc_preview 2013-08-29 10:50:55 +02:00
upgrade.php