]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
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)
commit75eb0fd8190bb462667f75e7bd64b9d6c0ee9a8a
treead6432bff593a90170503fd048744ce72f60be32
parent65bec664529b7f9af6f312fc8947efdac1c96b43
parent0e412abfa5d4d3d416b08d19a7274e59ff34108b
Merge pull request #1 from perryst5/perryst5-patch-1

Fix merge conflict