André Colomb 0ce92befc8 chore(gui): fix merge conflict on Weblate (#9882) ... Commit dee920a840c85a7d5d7a63c0de6bf824a4b806b6 was merged into Weblate's repository, but later replaced on main by 2167ce9656. This led to a merge conflict, which this commit fixes cleanly. After merging, we can unlock Weblate again.		2024-12-21 21:54:17 +00:00
..
assets	chore(gui): fix merge conflict on Weblate (#9882)	2024-12-21 21:54:17 +00:00
syncthing	chore(gui, man, authors): update docs, translations, and contributors	2024-12-09 03:50:45 +00:00
vendor	chore(gui): update HumanDuration.js (#9710)	2024-09-15 10:21:18 +02:00
index.html	chore(gui): group logout/restart/shutdown buttons together in Actions menu (#9801)	2024-11-07 16:47:00 +01:00
modal.html	gui: Update to Font Awesome v5 (#4889)	2018-05-24 19:59:32 +01:00