c25d4d3f4f
Conflicts: Gemfile Gemfile.lock |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
app_config.yml.SAMPLE | ||
application.rb | ||
boot.rb | ||
database.yml.MySQL_SAMPLE | ||
database.yml.SQLite_SAMPLE | ||
deploy.rb.SAMPLE | ||
environment.rb | ||
i18n-js.yml | ||
navigation.rb | ||
routes.rb | ||
schedule.rb |