fixing conflicts [#5]

2015-07-16 20:18:33 +02:00
parent a63b272f8b 24fb2765b9
commit c24c78e5e7
6 changed files with 1512 additions and 13 deletions
--- a/1
+++ b/1
@@ -33,6 +33,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 # gem 'capistrano-rails', group: :development

 gem "responders"
+gem 'foundation-rails'

 group :development, :test do
  # Call 'byebug' anywhere in the code to stop execution and get a debugger console