projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0c01f8 fb6ebbc)
Merge branch 'master' of vcs.fsf.org:enc-live
authorMolly de Blanc <molly@fsf.org>
Mon, 18 Jun 2018 14:28:15 +0000 (10:28 -0400)
committerMolly de Blanc <molly@fsf.org>
Mon, 18 Jun 2018 14:28:15 +0000 (10:28 -0400)
1  2 
en/index.html patch | diff1 | diff2 | blob | history
en/mac.html patch | diff1 | diff2 | blob | history
en/windows.html patch | diff1 | diff2 | blob | history

diff --cc en/index.html
Simple merge
diff --cc en/mac.html
Simple merge
diff --cc en/windows.html
Simple merge