mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-11-24 02:27:19 +00:00
Resolve merge conflict
This commit is contained in:
commit
bb51e399ff
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user