Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ...

Conflicts:
	apps/files_encryption/tests/keymanager.php

2013-08-17 13:15:22 +02:00

..

ajax

new version drop down

2013-07-25 10:35:19 +02:00

appinfo

new version drop down

2013-07-25 10:35:19 +02:00

css

increase width of versions dialog

2013-08-17 11:01:43 +02:00

js

remove unused code; use jquery

2013-07-25 11:15:24 +02:00

l10n

remove ru_RU - fixes #3135

2013-08-17 11:43:37 +02:00

lib

Merge branch 'master' into decrypt_files_again

2013-08-17 13:15:22 +02:00

download.php

new version drop down

2013-07-25 10:35:19 +02:00