aboutsummaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-09-04 08:37:22 -0500
committerBrandon Mathis <brandon@imathis.com>2011-09-04 08:37:22 -0500
commited0c220523f81a9f29009f8bbb75ff50052465d4 (patch)
treeed925f206fc9d72fe806856a07525ec0118a3972 /Gemfile
parent3cedd387a0fd4522023ef335307cbc096a3c2005 (diff)
parentf03c4cdb2abe524e097fdfc67194e8d9fc0d19ab (diff)
downloadmy_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.tar.xz
my_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.zip
Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts: plugins/category_generator.rb
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ffb614f2..14ee9669 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,4 +10,5 @@ gem 'haml', '>= 3.1'
gem 'compass', '>= 0.11'
gem 'rubypants'
gem 'rb-fsevent'
-gem 'stringex' \ No newline at end of file
+gem 'stringex'
+gem 'unicode_utils' \ No newline at end of file