Jared Jacobson 84c8cb052b Merge branch 'master' into develop ... # Conflicts: # go.mod # go.sum		2021-09-03 13:54:05 +10:00
..
api	Add tracing to user API (#1948)	2021-08-03 11:23:25 +01:00
internal	Delete device keys/signatures from key server when deleting devices (#1979)	2021-08-18 12:07:09 +01:00
inthttp	Key backups (1/2) : Add E2E session backup metadata tables (#1943)	2021-07-27 12:47:32 +01:00
storage	Merge branch 'master' into develop	2021-09-03 13:54:05 +10:00
userapi.go	Make bcrypt cost configurable (#1793)	2021-03-08 13:19:02 +00:00
userapi_test.go	Implement OpenID module (#599) (#1812)	2021-04-07 13:26:20 +01:00