projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 367b6ce 77fcfb4)
Merge branch 'master' of vcs.fsf.org:enc
authorAdam Leibson <adaml@fsf.org>
Tue, 18 Aug 2015 20:37:49 +0000 (16:37 -0400)
committerAdam Leibson <adaml@fsf.org>
Tue, 18 Aug 2015 20:37:49 +0000 (16:37 -0400)
1  2 
en/workshops.html patch | diff1 | diff2 | blob | history

diff --cc en/workshops.html
Simple merge