kondou 0ba498119c Merge branch 'master' into oc_avatars ... Conflicts: 3rdparty		2013-08-28 23:21:26 +02:00
..
ajax	adding translations to update events	2013-08-27 00:26:44 +02:00
avatar	Use OC.Router.generate, TODO use cache, prepare for defaultavatars	2013-08-28 21:20:28 +02:00
css	Merge branch 'master' into oc_avatars	2013-08-28 16:44:11 +02:00
doc	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
img	Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff	2013-08-25 21:06:02 +02:00
js	Merge pull request #4618 from owncloud/visualize-js	2013-08-28 14:17:50 -07:00
l10n	[tx-robot] updated from transifex	2013-08-28 06:24:14 -04:00
lostpassword	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
templates	Merge branch 'master' into oc_avatars	2013-08-28 16:44:11 +02:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
routes.php	Continue work on cropper	2013-08-28 16:39:00 +02:00
setup.php	Suppress the notice from the nullbyte check	2013-04-09 21:11:44 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00