]> 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: 65bec66 0e412ab)
Merge pull request #1 from perryst5/perryst5-patch-1 6343/head
authorperryst5 <perryst5@gmail.com>
Mon, 2 Mar 2015 02:38:54 +0000 (21:38 -0500)
committerperryst5 <perryst5@gmail.com>
Mon, 2 Mar 2015 02:38:54 +0000 (21:38 -0500)
Fix merge conflict


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