Jonas Franz a8dc699e74 Merge branch 'master' into feat/approval-new ... # Conflicts: # models/error.go # models/migrations/migrations.go # models/models.go # public/js/index.js		2018-05-19 18:17:01 +02:00
..
code.gitea.io	Merge branch 'master' into feat/approval-new	2018-05-17 14:00:21 +02:00
github.com	Add support for FIDO U2F (#3971)	2018-05-19 17:12:37 +03:00
golang.org/x	Fix govendor for x/crupto curve25519 (#2925)	2017-11-17 11:16:47 +08:00
gopkg.in	Various wiki bug fixes (#2996)	2017-11-28 17:43:51 +08:00
strk.kbt.io/projects/go/libravatar	Added all required dependencies	2016-11-04 08:43:11 +01:00
vendor.json	Merge branch 'master' into feat/approval-new	2018-05-19 18:17:01 +02:00