develop #18

Manually merged
samuel-p merged 6 commits from develop into master 2020-07-17 23:45:48 +00:00

6 Commits

Author SHA1 Message Date
Samuel Philipp 54797c88f1 Merge branch 'master' into develop
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
2020-07-17 23:45:20 +00:00
Samuel Philipp a25f5565d0 updated .drone.yml
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
2020-07-18 01:34:31 +02:00
Samuel Philipp 5a68798626 Merge remote-tracking branch 'origin/develop' into develop
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/pr Build is failing Details
# Conflicts:
#	package-lock.json
2020-07-18 01:19:46 +02:00
Samuel Philipp 4945500a08 fixed #14 and some other spelling issues 2020-07-18 01:19:34 +02:00
Samuel Philipp 5f132e533c Merge pull request 'Update dependency @fortawesome/fontawesome-free to ^5.14.0' (#16) from renovate/fortawesome-fontawesome-free-5.x into develop
continuous-integration/drone/push Build is passing Details
Reviewed-on: #16
2020-07-16 12:59:41 +00:00
Renovate Bot 8aff408b5a Update dependency @fortawesome/fontawesome-free to ^5.14.0
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
2020-07-16 02:04:32 +00:00