aboutsummaryrefslogtreecommitdiff
path: root/app/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.frQuentin Dufour2020-09-211-5/+29
|\
| * Upgrade Element Web to new config.jsonQuentin2020-09-181-5/+29
| | | | | | | | | | | | | | - Display deuxfleurs.fr and not im.deuxfleurs.fr on login screen - Remove broken welcome page on login - Set our jitsi instance - Add more servers in the room discovery page
* | Add plumeQuentin Dufour2020-09-214-1/+6
|/
* Refactor 2Quentin2020-09-1274-0/+1358