Merge branch 'hotfix/0.4.1.1'
Configured based on Ninefold instructions
ran bundle on master
ran bundle on master
ran bundle on master
deleted Gemfile.lock and bundle installed again
new Gemfile.lock
new Gemfile.lock
added config/diaspora.yml
added config/diaspora.yml
updated seed.rb to add Dane without a real pw
added factory_girl_rails outside of test so seed will work
added redis.conf
added some tweaks to diaspora.conf
added some tweaks to diaspora.conf to add sendgrid
tweaked seed.rb to add dane in place of admin
tweaked seed.rb to add dane in place of admin
adds amazon s3 storage for images
adds amazon s3 storage for images
adds amazon s3 storage for images