]> git.r.bdr.sh - rbdr/r.bdr.sh/commit
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)
commit78bae1f1f9a369c6b0c2ba934063d70866c79b74
tree3abf0bb1fdebb1af646d1de1b7acb5c986ca9819
parent899b70c507fb775cbcbaecd368562599d4c345ab
parent2148916ebb5305003b788e278de28a4be638d879
Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal

Conflicts:
jekyll/about.html
jekyll/projects.html