nextcloud/core
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +01:00
..
ajax Sanitize the exception 2013-01-19 19:57:17 +01:00
css Merge pull request #1059 from owncloud/fixing-998-master 2013-01-26 04:15:40 -08:00
doc rename to doc 2012-12-14 14:39:05 +01:00
img fix logout icon, hopefully also #969 2012-12-20 13:49:43 +01:00
js Merge branch 'master' into updater-CSP 2013-01-28 09:57:24 +01:00
l10n [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
lostpassword Remove echo from lost password page 2013-01-04 11:12:28 -05:00
templates Merge branch 'master' into updater-CSP 2013-01-28 09:57:24 +01:00
minimizer.php adding space between) and { 2012-09-07 15:22:01 +02:00
routes.php Add a route to the JS config 2013-01-20 23:46:46 +01:00
setup.php Simplify has sqlite test 2012-12-04 19:34:24 +00:00
strings.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00