Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php		2013-06-13 13:17:35 +02:00
..
ajax	port 22c8194cc8	2013-04-02 21:03:13 +02:00
css	Merge pull request #3679 from owncloud/multiselect-fixes	2013-06-12 09:52:15 -07:00
doc
img	Add shellscript for optimization.	2013-04-13 10:40:46 +02:00
js	multiselect: fixed 'add group' interface a bit	2013-06-11 18:21:13 +02:00
l10n	[tx-robot] updated from transifex	2013-06-11 02:02:44 +02:00
lostpassword	print a warning if a user wants to reset his password and encryption is enabled	2013-06-05 18:38:39 +02:00
templates	Merge pull request #3179 from pawl/patch-1	2013-05-28 05:18:43 -07:00
minimizer.php
routes.php	implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout	2013-02-26 19:34:46 +01:00
setup.php	Suppress the notice from the nullbyte check	2013-04-09 21:11:44 +02:00
strings.php