Claire 6c20dad201 
	
	
	Merge branch 'main' into glitch-soc/merge-upstream ... 
			Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js` 
		
	 
		2023-01-05 14:16:25 +01:00 
	 
	
	
	
		 
	
	
		
			
			
			
			
			
			2022-11-20 19:28:13 +01:00 
		 
	
		
			
			
			
			
			
			2022-07-05 02:41:40 +02:00 
		 
	
		
			
			
			
			
			
			2022-10-02 18:46:22 +02:00 
		 
	
		
			
			
			
			
			
			2022-10-08 16:45:40 +02:00 
		 
	
		
			
			
			
			
			
			2022-02-22 20:14:17 +01:00 
		 
	
		
	
		
	
		
			
			
			
			
			
			2020-09-15 14:37:58 +02:00 
		 
	
		
	
		
			
			
			
			
			
			2021-12-05 21:48:39 +01:00 
		 
	
		
			
			
			
			
			
			2022-12-07 02:35:39 +01:00 
		 
	
		
	
		
			
			
			
			
			
			2022-12-15 18:50:11 +01:00 
		 
	
		
			
			
			
			
			
			2022-02-10 22:00:10 +01:00 
		 
	
		
			
			
			
			
			
			2022-03-08 09:14:39 +01:00 
		 
	
		
			
			
			
			
			
			2020-01-23 22:00:13 +01:00 
		 
	
		
			
			
			
			
			
			2020-01-23 22:00:13 +01:00 
		 
	
		
			
			
			
			
			
			2020-01-23 22:00:13 +01:00 
		 
	
		
			
			
			
			
			
			2022-02-14 21:27:53 +01:00 
		 
	
		
	
		
	
		
			
			
			
			
			
			2021-04-17 03:14:25 +02:00 
		 
	
		
	
		
	
		
	
		
			
			
			
			
			
			2022-11-14 08:06:06 +01:00 
		 
	
		
	
		
			
			
			
			
			
			2022-06-28 09:42:13 +02:00 
		 
	
		
	
		
			
			
			
			
			
			2020-06-02 19:24:53 +02:00 
		 
	
		
	
		
			
			
			
			
			
			2020-01-08 22:42:05 +01:00 
		 
	
		
			
			
			
			
			
			2022-08-24 19:00:55 +02:00 
		 
	
		
			
			
			
			
			
			2020-06-02 19:24:53 +02:00 
		 
	
		
			
			
			
			
			
			2022-09-20 23:51:21 +02:00 
		 
	
		
	
		
	
		
			
			
			
			
			
			2021-04-12 12:37:14 +02:00 
		 
	
		
			
			
			
			
			
			2022-10-02 18:46:22 +02:00 
		 
	
		
			
			
			
			
			
			2020-12-18 09:18:31 +01:00 
		 
	
		
			
			
			
			
			
			2022-04-28 17:47:34 +02:00 
		 
	
		
	
		
			
			
			
			
			
			2020-12-18 09:18:31 +01:00 
		 
	
		
			
			
			
			
			
			2020-09-15 14:37:58 +02:00 
		 
	
		
			
			
			
			
			
			2020-10-12 16:33:49 +02:00 
		 
	
		
	
		
	
		
			
			
			
			
			
			2021-06-21 17:07:30 +02:00 
		 
	
		
	
		
			
			
			
			
			
			2022-11-01 13:01:39 +01:00 
		 
	
		
	
		
	
		
			
			
			
			
			
			2021-01-31 21:24:57 +01:00 
		 
	
		
			
			
			
			
			
			2020-06-02 19:24:53 +02:00 
		 
	
		
	
		
	
		
	
		
			
			
			
			
			
			2022-10-08 16:45:40 +02:00 
		 
	
		
			
			
			
			
			
			2022-01-28 08:58:32 +01:00 
		 
	
		
			
			
			
			
			
			2020-05-08 20:17:16 +02:00 
		 
	
		
	
		
	
		
	
		
			
			
			
			
			
			2022-03-09 09:06:17 +01:00 
		 
	
		
			
			
			
			
			
			2021-02-21 19:50:12 +01:00 
		 
	
		
	
		
			
			
			
			
			
			2021-05-06 14:22:54 +02:00 
		 
	
		
			
			
			
			
			
			2021-03-24 10:44:31 +01:00 
		 
	
		
	
		
			
			
			
			
			
			2022-01-19 22:37:27 +01:00 
		 
	
		
			
			
			
			
			
			2022-01-17 00:49:55 +01:00 
		 
	
		
			
			
			
			
			
			2022-10-28 19:23:58 +02:00 
		 
	
		
	
		
			
			
			
			
			
			2022-10-08 16:45:40 +02:00 
		 
	
		
			
			
			
			
			
			2020-06-02 19:24:53 +02:00 
		 
	
		
			
			
			
			
			
			2021-07-08 16:17:19 +02:00 
		 
	
		
			
			
			
			
			
			2022-07-17 13:49:29 +02:00 
		 
	
		
			
			
			
			
			
			2023-01-04 02:12:48 +01:00 
		 
	
		
			
			
			
			
			
			2020-04-15 20:33:24 +02:00 
		 
	
		
	
		
			
			
			
			
			
			2022-07-05 02:41:40 +02:00 
		 
	
		
			
			
			
			
			
			2022-07-05 02:41:40 +02:00 
		 
	
		
			
			
			
			
			
			2020-09-16 20:16:46 +02:00 
		 
	
		
			
			
			
			
			
			2022-06-09 21:57:36 +02:00