mirror of
https://github.com/YunoHost-Apps/calckey_ynh.git
synced 2024-09-03 18:16:18 +02:00
Merge branch 'master' into testing
Resolved conflicts
This commit is contained in:
commit
5c57032249
Resolved conflicts