1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-16 02:19:55 +00:00

Resolve merge conflict

This commit is contained in:
Jermolene 2014-12-30 18:45:21 +00:00
commit bb51e399ff

View File

@ -202,3 +202,5 @@ Jean-Charles Longuet, @Jc-L, 2014/12/22
Evgeniy Gryaznov, @evgeniy-gryaznov, 2014/12/23
Andrew Harrison, @infurnoape, 2014/12/27
Arlen Beiler, @arlen22, 2014/12/30