]> pere.pagekite.me Git - text-free-culture-lessig.git/commitdiff
projects / text-free-culture-lessig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccc8b85 513c51d)
Merge remote-tracking branch 'upstream/master'
authorben <ben@saturne.(none)>
Sat, 1 Aug 2015 19:58:32 +0000 (21:58 +0200)
committerben <ben@saturne.(none)>
Sat, 1 Aug 2015 19:58:32 +0000 (21:58 +0200)
1  2 
myclass.cls patch | diff1 | diff2 | blob | history

diff --cc myclass.cls
Simple merge