Dries Vints 21c3ef96f4 Merge branch '8.x' ... # Conflicts: # CHANGELOG.md		2021-11-16 17:50:11 +01:00
..
en	Merge branch '8.x'	2021-11-16 17:50:11 +01:00
en.json	added password translation rules	2021-10-14 14:45:08 -05:00