]> source.dussan.org Git - gitignore.git/commitdiff
Merge remote-tracking branch 'origin/master' 1162/head
authormaieul <maieul@maieul.net>
Thu, 31 Jul 2014 13:51:54 +0000 (15:51 +0200)
committermaieul <maieul@maieul.net>
Thu, 31 Jul 2014 13:51:54 +0000 (15:51 +0200)
1  2 
TeX.gitignore

diff --cc TeX.gitignore
Simple merge