antelle 97374f63f9 Merge branch 'master' into develop ... # Conflicts: # desktop/package-lock.json # package-lock.json # release-notes.md		2021-03-02 20:10:18 +01:00
..
actions	fixed linux build	2021-02-03 22:00:03 +01:00
ISSUE_TEMPLATE	cleanup	2021-01-17 08:20:08 +01:00
workflows	using the provisioning profile on ci	2021-01-10 12:23:18 +01:00
CODE_OF_CONDUCT.md	added code of conduct	2017-11-13 23:04:30 +01:00
FUNDING.yml	GitHub funding link	2020-12-18 20:26:36 +01:00
PULL_REQUEST_TEMPLATE.md	grammar	2017-12-09 23:50:05 +01:00