diff options
| author | Brandon Mathis <brandon@imathis.com> | 2011-09-04 08:37:22 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2011-09-04 08:37:22 -0500 |
| commit | ed0c220523f81a9f29009f8bbb75ff50052465d4 (patch) | |
| tree | ed925f206fc9d72fe806856a07525ec0118a3972 /Gemfile | |
| parent | 3cedd387a0fd4522023ef335307cbc096a3c2005 (diff) | |
| parent | f03c4cdb2abe524e097fdfc67194e8d9fc0d19ab (diff) | |
| download | my_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 '')
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index f2fc737d..000eec9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,6 +42,7 @@ GEM sass (3.1.7) stringex (1.3.0) syntax (1.0.0) + unicode_utils (1.0.0) PLATFORMS ruby @@ -58,3 +59,4 @@ DEPENDENCIES rdiscount rubypants stringex + unicode_utils |