Conflicts: README.Developer app/views/packages/details.slim bin/get-data-from-old-live-server.sh |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| database.yml | ||
| environment.rb | ||
| routes.rb | ||
Conflicts: README.Developer app/views/packages/details.slim bin/get-data-from-old-live-server.sh |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| database.yml | ||
| environment.rb | ||
| routes.rb | ||