projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c02b699 0f9adb4)
Merge branch 'update21' into live
authorAndrew Engelbrecht <andrew@fsf.org>
Tue, 13 Jul 2021 20:52:07 +0000 (16:52 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Tue, 13 Jul 2021 20:52:07 +0000 (16:52 -0400)
we went live with the update21 branch, and now we want to work on
changes in the live branch

1  2 
en/index.html patch | diff1 | diff2 | blob | history

diff --cc en/index.html
Simple merge