| Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code | ||
|---|---|---|
| .. | ||
| about.js | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public.js | ||
| share.js | ||
| Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code | ||
|---|---|---|
| .. | ||
| about.js | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public.js | ||
| share.js | ||