Merge changes in master to beta branch (concurrency fixes)

This commit is contained in:
Miroslav Prasil
2018-08-01 11:37:42 +01:00
6 changed files with 79 additions and 32 deletions

View File

@@ -34,7 +34,10 @@ pub fn routes() -> Vec<Route> {
post_ciphers_admin,
post_ciphers_import,
post_attachment,
post_attachment_admin,
post_attachment_share,
delete_attachment_post,
delete_attachment_post_admin,
delete_attachment,
post_cipher_admin,
post_cipher_share,