f950f77f36
Conflicts: Gemfile app/models/ad_banner.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
config.yml | ||
database.yml.example | ||
dump.rdb | ||
environment.rb | ||
list.yml | ||
mongoid.yml | ||
resque.god | ||
resque_schedule.yml | ||
routes.rb |