diff options
| author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-09-21 11:57:48 +0200 |
|---|---|---|
| committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-09-21 11:57:48 +0200 |
| commit | 33fe06d9edd5bc3a637e5b0e5f979dbced8f95d0 (patch) | |
| tree | 5d8370d7dd2f0ecae9de7b35fb7d952e841b4e0b /Gemfile.lock | |
| parent | 35239fc1f4641db1e602383b43cc29b151cde9b9 (diff) | |
| parent | f3100ad9d93fd31a043594815e260958f5ceaff0 (diff) | |
Merge branch 'convert-templates-to-haml' into next-tech-1
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 17095fc..7a42ab5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,6 +35,12 @@ GEM hike (1.2.3) hooks (0.4.0) uber (~> 0.0.4) + hpricot (0.8.6) + html2haml (1.0.1) + erubis (~> 2.7.0) + haml (>= 4.0.0.rc.1) + hpricot (~> 0.8.6) + ruby_parser (~> 3.1.1) http_parser.rb (0.5.3) i18n (0.6.9) json (1.8.1) @@ -108,7 +114,10 @@ GEM ffi (>= 0.5.0) rb-kqueue (0.2.2) ffi (>= 0.5.0) + ruby_parser (3.1.3) + sexp_processor (~> 4.1) sass (3.2.19) + sexp_processor (4.4.4) sprockets (2.12.0) hike (~> 1.2) multi_json (~> 1.0) @@ -134,6 +143,7 @@ PLATFORMS DEPENDENCIES bootstrap-sass builder (~> 3.0) + html2haml middleman (~> 3.3.2) middleman-blog (~> 3.5.2) middleman-deploy |