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
..
authentication.en-us.md	General documentation cleanup (#3317)	2018-01-08 23:48:42 +01:00
authentication.zh-cn.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00
authentication.zh-tw.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00
comparison.en-us.md	Merge branch 'master' into feat/approval-new	2018-05-19 18:17:01 +02:00
localization.en-us.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00
localization.zh-cn.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00
localization.zh-tw.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00
webhooks.en-us.md	General documentation cleanup (#3317)	2018-01-08 23:48:42 +01:00
webhooks.zh-cn.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00
webhooks.zh-tw.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00