Merging

2014-07-18 18:56:35 -07:00
parent a04a72d776 e64eb1f153
commit 21ec7bb82a
168 changed files with 6133 additions and 966 deletions
@@ -25,6 +25,11 @@ gem 'acts_as_list'
 gem 'geocoder'
 gem 'forgery'
 gem 'paper_trail'
+gem 'font-awesome-rails'
+gem 'wysiwyg-rails'
+gem 'rails-assets-cdn'
+gem 'sitemap_generator'
+gem 'activerecord-session_store'

 group :development, :test do
 	gem 'rspec'