Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less app/views/orders/_articles.html.haml app/views/orders/show.html.haml |
||
|---|---|---|
| .. | ||
| de.yml | ||
| en.yml | ||
| fr.yml | ||
| nl.yml | ||
| overrides.yml | ||
Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less app/views/orders/_articles.html.haml app/views/orders/show.html.haml |
||
|---|---|---|
| .. | ||
| de.yml | ||
| en.yml | ||
| fr.yml | ||
| nl.yml | ||
| overrides.yml | ||