Bjoern Schiessle f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617 ... Conflicts: settings/ajax/changepassword.php		2013-09-23 10:39:12 +02:00
..
capabilities.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
crypt.php	Employ config option for OpenSSL config file, if provided.	2013-09-02 09:59:00 -04:00
helper.php	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-16 10:42:37 +02:00
keymanager.php	fix part file handling and real size calculation, this should also solve #4581	2013-09-06 16:06:34 +02:00
proxy.php	use path relative to data/	2013-07-30 10:14:17 +02:00
session.php	no longer enforce log out, but provide useful errors/warnings instead	2013-09-06 12:27:40 +02:00
stream.php	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-16 10:42:37 +02:00
util.php	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-23 10:39:12 +02:00