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
..
core	Merge branch 'ws'	2018-09-13 15:59:45 +02:00
icons.rs	Don't ignore errors while downloading icons	2018-07-01 15:27:42 +02:00
identity.rs	Add IP and Username to failed login attempts	2018-08-25 17:07:59 -05:00
mod.rs	Initial version of websockets notification support.	2018-08-30 17:58:53 +02:00
notifications.rs	Add error message when the proxy doesn't route websockets correctly	2018-09-11 17:09:33 +02:00
web.rs	Return 404 in case the path doesn't match instead of 500	2018-07-18 11:54:33 +01:00