mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2025-09-10 23:06:06 +00:00
Merge branch 'fr-FR' of https://github.com/xcazin/TiddlyWiki5 into xcazin-fr-FR
Conflicts: languages/fr-FR/ControlPanel.tids licenses/cla-individual.md
This commit is contained in:
@@ -138,3 +138,5 @@ Simon Baird, @simonbaird, 2014/01/29
|
||||
Daniel Barrett, @shendaras, 2014/02/07
|
||||
|
||||
Bram Chen, @BramChen, 2014/02/20
|
||||
|
||||
Xavier Cazin, @xcazin, 2014/02/21
|
||||
|
Reference in New Issue
Block a user