Resolving merge conflicts caused by silly workflow.
authorZak Rogoff <zak@montage.office.fsf.org>
Mon, 22 Sep 2014 15:15:20 +0000 (11:15 -0400)
committerZak Rogoff <zak@montage.office.fsf.org>
Mon, 22 Sep 2014 15:15:20 +0000 (11:15 -0400)
commit79cf337414ea1c2b9b444fc7ad7fabad008d60a4
tree519b941316e075df2e5b64cd8790aa4586dd0609
parent8a95fcd835f38638516c4cb019497a9f25629c78
parenta6b43cb0006e691e3ef7c0bb982cab89ee544e6f
Resolving merge conflicts caused by silly workflow.
2015/index.html