Merge branch '2.1' into site

This commit is contained in:
Brandon Mathis 2012-06-11 00:26:16 -05:00
commit 29d3c71366
2 changed files with 6 additions and 1 deletions

5
.powrc Normal file
View File

@ -0,0 +1,5 @@
if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ] ; then
source "$rvm_path/scripts/rvm"
source ".rvmrc"
fi

View File

@ -28,7 +28,7 @@ email: brandon@imathis.com
# If publishing to a subdirectory as in http://site.com/project set 'root: /project' # If publishing to a subdirectory as in http://site.com/project set 'root: /project'
root: / root: /
permalink: /blog/:year/:month/:day/:title/ permalink: /:year/:month/:day/:title/
source: source source: source
destination: public destination: public
plugins: plugins plugins: plugins