280d7b1df8
Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes). |
||
|---|---|---|
| .. | ||
| _account.html.haml | ||
| _action_log.html.haml | ||
| _report.html.haml | ||
| _status.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||