develop #25

Manually merged

samuel-p merged 11 commits from develop into master 2020-08-28 22:58:48 +00:00

Conversation 0 Commits 11 Files changed 7 +51 -3

11 commits

Author	SHA1	Message	Date
samuel-p	8f920e051f	added jitsi description	2020-08-29 00:44:12 +02:00
samuel-p	cfd940a207	added account migration tool	2020-08-25 23:03:38 +02:00
samuel-p	e195f5fad1	removed jitsi added placeholders	2020-08-11 23:14:07 +02:00
samuel-p	32ac02e6af	removed jitsi beta and added placeholders	2020-08-11 00:04:56 +02:00
samuel-p	a449a98660	Merge remote-tracking branch 'origin/develop' into develop	2020-08-10 22:41:56 +02:00
samuel-p	32c475e9a6	added shields beta	2020-08-10 22:41:45 +02:00
Samuel Philipp	0ac2ebeec3	Merge pull request 'Update dependency bootstrap to ^4.5.2' (#24) from renovate/bootstrap-4.x into develop ... Reviewed-on: #24	2020-08-07 17:52:28 +00:00
Renovate Bot	49e87a51f8	Update dependency bootstrap to ^4.5.2	2020-08-07 02:04:50 +00:00
Samuel Philipp	1742c571b4	Merge pull request 'Update dependency bootstrap to ^4.5.1' (#23) from renovate/bootstrap-4.x into develop ... Reviewed-on: #23	2020-08-05 19:37:38 +00:00
Renovate Bot	d0ac6cb8bb	Update dependency bootstrap to ^4.5.1	2020-08-05 02:04:46 +00:00
samuel-p	c56e06e859	updated README.md	2020-07-31 00:09:56 +02:00