develop #23

Manually merged

samuel-p merged 8 commits from develop into master 2020-08-09 14:53:57 +00:00

Conversation 0 Commits 8 Files changed 2 +3 -3

8 commits

Author	SHA1	Message	Date
samuel-p	4284b6dea1	Merge remote-tracking branch 'origin/master' into develop ... # Conflicts: # package.json	2020-08-09 16:25:45 +02:00
samuel-p	d01bed0737	updated README.md	2020-08-09 16:20:11 +02:00
Samuel Philipp	435a3ee58f	Merge pull request 'Update dependency bootstrap to ^4.5.2' (#22) from renovate/bootstrap-4.x into develop ... Reviewed-on: #22	2020-08-07 17:00:53 +00:00
Renovate Bot	6322c199da	Update dependency bootstrap to ^4.5.2	2020-08-07 02:06:51 +00:00
Samuel Philipp	40079c873d	Merge pull request 'Update dependency gulp-terser to v1.3.2' (#21) from renovate/gulp-terser-1.x into develop ... Reviewed-on: #21	2020-08-06 20:58:20 +00:00
Renovate Bot	a9e9c07acd	Update dependency gulp-terser to v1.3.2	2020-08-06 02:06:28 +00:00
Samuel Philipp	6a64c86da7	Merge pull request 'Update dependency bootstrap to ^4.5.1' (#20) from renovate/bootstrap-4.x into develop ... Reviewed-on: #20	2020-08-05 19:09:39 +00:00
Renovate Bot	7f8fe79f7c	Update dependency bootstrap to ^4.5.1	2020-08-05 02:06:56 +00:00