develop #33

Manually merged

samuel-p merged 6 commits from develop into master 2020-10-17 21:57:52 +00:00

Conversation 0 Commits 6 Files changed 3 +7 -2

6 commits

Author	SHA1	Message	Date
samuel-p	a5e1f8928d	Merge remote-tracking branch 'origin/develop' into develop	2020-10-17 19:40:42 +02:00
samuel-p	5aca008510	added matrix server rules	2020-10-17 19:36:35 +02:00
Samuel Philipp	8031bc15c7	Merge pull request 'Update dependency bootstrap to ^4.5.3' (#32) from renovate/bootstrap-4.x into develop ... Reviewed-on: #32	2020-10-15 19:08:39 +00:00
Renovate Bot	12dca05676	Update dependency bootstrap to ^4.5.3	2020-10-15 05:05:15 +00:00
Samuel Philipp	d0971d3f07	Merge pull request 'Update dependency @fortawesome/fontawesome-free to ^5.15.1' (#31) from renovate/fortawesome-fontawesome-free-5.x into develop ... Reviewed-on: #31	2020-10-06 15:04:58 +00:00
Renovate Bot	7e61850fbd	Update dependency @fortawesome/fontawesome-free to ^5.15.1	2020-10-06 05:06:36 +00:00