a1e74987dc
Conflicts: Gemfile.lock app/assets/javascripts/.DS_Store app/assets/stylesheets/style.css.erb app/views/layouts/_orbit_bar.html.erb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
config.yml | ||
database.yml.example | ||
environment.rb | ||
list.yml | ||
mongoid.yml | ||
resque.god | ||
resque_schedule.yml | ||
routes.rb |