Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
|---|---|---|
| .. | ||
| two_factor | ||
| new.html.haml | ||
| sign_in_token.html.haml | ||
| two_factor.html.haml | ||
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
|---|---|---|
| .. | ||
| two_factor | ||
| new.html.haml | ||
| sign_in_token.html.haml | ||
| two_factor.html.haml | ||