Michael Gapczynski 60feaf9abf Merge branch 'master' into share_expiration ... Conflicts: core/js/share.js lib/util.php		2012-09-12 01:06:57 -04:00
..
ajax	Merge branch 'master' into share_expiration	2012-09-12 01:06:57 -04:00
css	move breadcrumb css to core so we can reuse it	2012-09-09 03:00:01 +02:00
img	Add lock and clock icon for sharing	2012-09-12 01:02:08 -04:00
js	Merge branch 'master' into share_expiration	2012-09-12 01:06:57 -04:00
l10n	[tx-robot] updated from transifex	2012-09-11 02:03:53 +02:00
lostpassword	fixing syntax error - sorry for that	2012-09-04 13:13:18 +03:00
templates	Move handling of core remotes to OC_TemplateLayout	2012-09-07 16:42:46 +02:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00