]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47c0ee7 8a2ff91)
Merge branch 'chrisjlee-patch-1'
authorGeoff Kimball <gakimball@bsu.edu>
Mon, 8 Sep 2014 00:25:16 +0000 (17:25 -0700)
committerGeoff Kimball <gakimball@bsu.edu>
Mon, 8 Sep 2014 00:25:16 +0000 (17:25 -0700)

Trivial merge
Mirror of https://github.com/foundation/foundation-sites.git