Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| challenges | ||
| confirmations | ||
| passwords | ||
| registrations | ||
| sessions | ||
| setup | ||
| shared | ||
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| challenges | ||
| confirmations | ||
| passwords | ||
| registrations | ||
| sessions | ||
| setup | ||
| shared | ||