]> git.r.bdr.sh - rbdr/r.bdr.sh/commitdiff
Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal
authorBen Beltran <redacted>
Thu, 6 Aug 2015 15:20:02 +0000 (10:20 -0500)
committerBen Beltran <redacted>
Thu, 6 Aug 2015 15:20:02 +0000 (10:20 -0500)
Conflicts:
jekyll/about.html
jekyll/projects.html


Trivial merge