Daniel García a01fee0b9f Merge branch 'ws' ...

# Conflicts:
#	Cargo.toml
#	src/api/core/ciphers.rs
#	src/main.rs

2018-09-13 15:59:45 +02:00

..

accounts.rs

Remove unnecessary return

2018-09-12 23:58:02 +02:00

ciphers.rs

Merge branch 'ws'

2018-09-13 15:59:45 +02:00

folders.rs

Initial version of websockets notification support.

2018-08-30 17:58:53 +02:00

global_domains.json

Updated global domains file

2018-06-12 23:24:49 +02:00

mod.rs

Implement organization import for admins and owners (Fixes #178)

2018-09-13 15:16:24 +02:00

organizations.rs

Implement organization import for admins and owners (Fixes #178)

2018-09-13 15:16:24 +02:00

two_factor.rs

Implemented PUT for u2f registration

2018-08-13 15:26:01 +02:00