Jens Langhammer 5977c09b05 Merge branch 'version-2021.2' ... # Conflicts: # authentik/admin/templates/administration/policy/list.html # web/src/pages/outposts/OutpostListPage.ts		2021-02-24 10:20:48 +01:00
..
development	wip: rename to authentik (#361)	2020-12-05 22:08:42 +01:00
events	events: triggers -> rules	2021-01-16 14:15:23 +01:00
expressions	wip: rename to authentik (#361)	2020-12-05 22:08:42 +01:00
flow	stages: add WebAuthn stage (#550)	2021-02-17 20:49:58 +01:00
installation	Merge branch 'version-2021.2'	2021-02-24 10:20:48 +01:00
integrations	docs: replace Autogenerated with managed mappings	2021-02-16 19:18:57 +01:00
maintenance/backups	wip: rename to authentik (#361)	2020-12-05 22:08:42 +01:00
outposts	wip: rename to authentik (#361)	2020-12-05 22:08:42 +01:00
policies	root: add initial geoip implementation	2021-02-12 09:52:14 +01:00
property-mappings	docs: replace Autogenerated with managed mappings	2021-02-16 19:18:57 +01:00
providers	docs: replace Autogenerated with managed mappings	2021-02-16 19:18:57 +01:00
releases	web: fix outpost edit/delete buttons	2021-02-24 09:44:55 +01:00
troubleshooting	root: global email settings (#448)	2021-01-05 00:41:10 +01:00
index.md	root: global email settings (#448)	2021-01-05 00:41:10 +01:00
sources.md	docs: point to ad integration in sources overview	2020-12-25 23:11:02 +01:00
terminology.md	wip: rename to authentik (#361)	2020-12-05 22:08:42 +01:00