mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-26 03:58:49 +01:00
Conflicts: Gemfile.lock app/assets/stylesheets/tracks.css.scss app/controllers/todos_controller.rb app/services/rich_message_extractor.rb app/services/todo_from_rich_message.rb app/views/todos/all_done.html.erb config/initializers/rack-mini-profiler.rb test/models/rich_message_extractor_test.rb test/models/todo_from_rich_message_test.rb |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| cucumber.yml | ||
| database.yml.tmpl | ||
| environment.rb | ||
| routes.rb | ||
| site.yml.tmpl | ||