Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.  | 
			||
|---|---|---|
| .. | ||
| about.js | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public-path.js | ||
| public.js | ||
| share.js | ||
				
					
						
							Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.  | 
			||
|---|---|---|
| .. | ||
| about.js | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public-path.js | ||
| public.js | ||
| share.js | ||