Commit Graph

4 Commits

Author SHA1 Message Date
LouisLam
2ce5c28ed4 Merge branch 'master' into feature/matrix-notifications
# Conflicts:
#	src/languages/en.js
2021-10-08 00:59:39 +08:00
LouisLam
e5f6d7f047 slack and rocket.chat use the primary base url
env var to show time logger
2021-10-07 17:39:58 +08:00
Gero Gerke
34b86352f2 remove double spaces 2021-10-05 21:40:59 +02:00
LouisLam
da74391c3e convert notifications into modules 2021-09-07 22:42:46 +08:00