diff options
author | gebele <gebele@in-silico.ch> | 2016-11-24 16:31:26 +0000 |
---|---|---|
committer | gebele <gebele@in-silico.ch> | 2016-11-24 16:31:26 +0000 |
commit | bfd31ed2c9d0cde8a53238c7368eb3d49c580b7d (patch) | |
tree | 91c3a2865302e1017db0dffb6015dfa3eb6c476f /Gemfile | |
parent | f0588c7e072ea3e22f26916d669e9baaa8fa3197 (diff) | |
parent | f86c084311282036ffa7b4588c0fa0d5b59af95b (diff) |
fixed merge
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,6 +1,9 @@ source "https://rubygems.org" gemspec +gem "lazar", :path => "../lazar" +gem "gem-path" gem "sinatra" +gem "sinatra-reloader" gem "haml" gem "sass" -gem "lazar", :path => "../lazar" +gem "rdiscount" |