Conflicts: app/controllers/admin/stats_controller.rb app/views/admin/stats/index.html.haml |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| serializers | ||
| views | ||
Conflicts: app/controllers/admin/stats_controller.rb app/views/admin/stats/index.html.haml |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| serializers | ||
| views | ||