Mélanie Chauvel (ariasuni) 
							
						 
					 
					
						
						
							
						
						669cf49c54 
					 
					
						
						
							
							[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI  
						
						 
						
						... 
						
						
						
						Port 5e4b649655  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 20:45:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bèr Kessels 
							
						 
					 
					
						
						
							
						
						fc53d9cc76 
					 
					
						
						
							
							[Glitch] Code style improvements in JavaScript  
						
						 
						
						... 
						
						
						
						Port fd76955f39  to glitch-soc
* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error.
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 20:43:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mélanie Chauvel (ariasuni) 
							
						 
					 
					
						
						
							
						
						35d2189ac8 
					 
					
						
						
							
							[Glitch] Change description of privacy levels to be more intuitive in web UI  
						
						 
						
						... 
						
						
						
						Port 4063f9f278  to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com >
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 20:37:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mélanie Chauvel (ariasuni) 
							
						 
					 
					
						
						
							
						
						bdb06f50ec 
					 
					
						
						
							
							[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI  
						
						 
						
						... 
						
						
						
						Port 2e18b1a2a2  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 20:19:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						3c96a0c21d 
					 
					
						
						
							
							[Glitch] Fix too large announcements not being scrollable in web UI  
						
						 
						
						... 
						
						
						
						Port 503eab1c1f  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 20:16:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								koyu 
							
						 
					 
					
						
						
							
						
						6211eff739 
					 
					
						
						
							
							[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI  
						
						 
						
						... 
						
						
						
						Port e69a3f54a1  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 20:15:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						c8f36a71ea 
					 
					
						
						
							
							[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI  
						
						 
						
						... 
						
						
						
						Port 39453de232  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 20:14:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mélanie Chauvel (ariasuni) 
							
						 
					 
					
						
						
							
						
						eae96cb204 
					 
					
						
						
							
							[Glitch] Add tooltips to audio/video player buttons  
						
						 
						
						... 
						
						
						
						Port 036ba3f510  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-03-08 19:59:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						2f2b48b227 
					 
					
						
						
							
							[Glitch] Fix /web redirecting to /web/web in web UI  
						
						 
						
						... 
						
						
						
						Port 0f07218e53  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-25 14:30:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						0d41fef506 
					 
					
						
						
							
							Document alt+enter  
						
						 
						
						
						
						
					 
					
						2020-02-22 23:07:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						bc4de2f661 
					 
					
						
						
							
							[Glitch] Add source-mapped stacktrace to error message in web UI  
						
						 
						
						... 
						
						
						
						Port ff3a11d01d  to glitch-soc 
						
						
					 
					
						2020-02-19 23:31:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						c9166a5943 
					 
					
						
						
							
							[Glitch] Fix old browsers crashing because of missing finally polyfill in web UI  
						
						 
						
						... 
						
						
						
						Port 1314bba68a  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-19 23:10:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						955f838f9d 
					 
					
						
						
							
							Fix clicking on the “TOOT” button send bogus visibility parameter  
						
						 
						
						
						
						
					 
					
						2020-02-16 00:10:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						40798cba41 
					 
					
						
						
							
							Fix alt+enter changing visibility setting without sending toot when toot is empty  
						
						 
						
						
						
						
					 
					
						2020-02-14 22:38:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						3d7fd4a2df 
					 
					
						
						
							
							Fix boosting private toots in detailed view  
						
						 
						
						
						
						
					 
					
						2020-02-09 22:15:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						5f61065e74 
					 
					
						
						
							
							[Glitch] Fix unread indicator on announcements not being aligned with text in web UI  
						
						 
						
						... 
						
						
						
						Port 90f04ea064  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-09 12:30:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						e443874024 
					 
					
						
						
							
							[Glitch] Fix native share button not being displayed for unlisted toots  
						
						 
						
						... 
						
						
						
						Port 02236332ba  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-09 12:29:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						fe9a124f5a 
					 
					
						
						
							
							[Glitch] Fix dates (without time) being rendered as datetimes in public pages  
						
						 
						
						... 
						
						
						
						Port c31d61d7f2  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-06 21:41:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fuyu 
							
						 
					 
					
						
						
							
						
						b9aa57d5bf 
					 
					
						
						
							
							[Glitch] Don't display toggle reveal button in video modal when full screen  
						
						 
						
						... 
						
						
						
						Port 5711899c59  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-06 21:39:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						885e9227c6 
					 
					
						
						
							
							Fix poll compose form being broken on single-column layout  
						
						 
						
						
						
						
					 
					
						2020-02-03 11:56:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						3dcb279da3 
					 
					
						
						
							
							[Glitch] Change how unread announcements are handled  
						
						 
						
						... 
						
						
						
						Port 3adc722d1c  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-03 09:31:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sasha Sorokin 
							
						 
					 
					
						
						
							
						
						dd6149ca0b 
					 
					
						
						
							
							[Glitch] Add "Show thread" button to public profiles  
						
						 
						
						... 
						
						
						
						Port 50cd73e5d7  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-03 09:30:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						9dc1f7d299 
					 
					
						
						
							
							[Glitch] Fix mascot being too large, and a code style issue  
						
						 
						
						... 
						
						
						
						Port bba0269d97  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-02-03 09:27:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						4cd2d13bd2 
					 
					
						
						
							
							When submitting markers, use last displayed notification, not last received one  
						
						 
						
						
						
						
					 
					
						2020-02-01 19:53:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						e135b293fa 
					 
					
						
						
							
							Fetch last read notification id to update unread notification count on load  
						
						 
						
						
						
						
					 
					
						2020-02-01 19:53:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						cf5b769857 
					 
					
						
						
							
							Add support for xmpp: and magnet: URIs to misleading link detection code  
						
						 
						
						
						
						
					 
					
						2020-01-28 20:25:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8bb5d1abaa 
					 
					
						
						
							
							[Glitch] Fix design of announcements in admin UI  
						
						 
						
						... 
						
						
						
						Port 305abc9e05  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-28 19:17:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						ed5fb51168 
					 
					
						
						
							
							[Glitch] Change announcements to be collapsed on page load in web UI  
						
						 
						
						... 
						
						
						
						Port 0fcc4b1c56  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-28 19:17:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						cf230d551f 
					 
					
						
						
							
							[Glitch] Change number animations direction based on decrease or increase  
						
						 
						
						... 
						
						
						
						Port 10e209d8e0  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-27 16:06:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						b0139dcf5e 
					 
					
						
						
							
							[Glitch] Add animations to announcement reactions  
						
						 
						
						... 
						
						
						
						Port dd4eec6bf6  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-27 16:05:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						41d0869d7f 
					 
					
						
						
							
							[Glitch] Change last_status_at to be a date, not datetime  
						
						 
						
						... 
						
						
						
						Port 42d2a915e4  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-27 16:03:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						187a822074 
					 
					
						
						
							
							[Glitch] Fix link colors in announcements  
						
						 
						
						... 
						
						
						
						Port 2f8c3c17ee  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-27 16:01:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						e36d0a98cc 
					 
					
						
						
							
							[Glitch] Add streaming API updates for announcements being modified or deleted  
						
						 
						
						... 
						
						
						
						Port b9d74d4076  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-27 16:01:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						8a8936725e 
					 
					
						
						
							
							[Glitch] Fix status overflowing in report dialog  
						
						 
						
						... 
						
						
						
						Port 389e3f6094  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-27 15:59:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						8924743349 
					 
					
						
						
							
							Refactor notifications cleaning mode  
						
						 
						
						
						
						
					 
					
						2020-01-26 14:55:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						5e4d1f699e 
					 
					
						
						
							
							[Glitch] Fix “new items glow” being displayed above settings and announcements  
						
						 
						
						... 
						
						
						
						Port 90b13ffd00  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 20:05:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						98d5ab6be9 
					 
					
						
						
							
							[Glitch] Fix spurious error and incorrect state change when adding a reaction twice  
						
						 
						
						... 
						
						
						
						Port c06d2ff437  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 19:53:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						6ce72f1fee 
					 
					
						
						
							
							[Glitch] Improve announcements design  
						
						 
						
						... 
						
						
						
						Port 48c55b6392  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 16:57:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						4e1efacfac 
					 
					
						
						
							
							[Glitch] Add limit of 8 different reaction types per announcement  
						
						 
						
						... 
						
						
						
						Port f816da9c64  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 10:36:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						f1e4738f81 
					 
					
						
						
							
							[Glitch] Add number animations  
						
						 
						
						... 
						
						
						
						Port 76f1ed834e  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 10:36:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						3c4bd03949 
					 
					
						
						
							
							[Glitch] Change font size of announcements to be the same as statuses  
						
						 
						
						... 
						
						
						
						Port b89e6cfe70  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 10:21:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sasha Sorokin 
							
						 
					 
					
						
						
							
						
						2bde217ea5 
					 
					
						
						
							
							[Glitch] Fix unlocalized dropdown button title  
						
						 
						
						... 
						
						
						
						Port 1268e3b572  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 10:20:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						1f8563c256 
					 
					
						
						
							
							Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream  
						
						 
						
						
						
						
					 
					
						2020-01-25 10:17:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Lubar 
							
						 
					 
					
						
						
							
						
						05351cbffb 
					 
					
						
						
							
							[Glitch] minor server-sent events fixes  
						
						 
						
						... 
						
						
						
						Port front-end changes from 0dfba0884e  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-25 10:13:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						bdc1581556 
					 
					
						
						
							
							Fix emoji button styling in glitch-soc  
						
						 
						
						
						
						
					 
					
						2020-01-24 16:45:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						376e524278 
					 
					
						
						
							
							[Glitch] Add announcements  
						
						 
						
						... 
						
						
						
						Port front-end changes from f52c988e12  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-24 16:45:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						4f51fe03c9 
					 
					
						
						
							
							[Glitch] Add “account timeline” filter category  
						
						 
						
						... 
						
						
						
						Port JS changes from 43daeccccb  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-24 15:27:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						de76a8969e 
					 
					
						
						
							
							[Glitch] Fix unfollow confirmations in account directory  
						
						 
						
						... 
						
						
						
						Port ec3ee67564  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-24 15:25:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Lubar 
							
						 
					 
					
						
						
							
						
						4417e9e1fd 
					 
					
						
						
							
							[Glitch] Add transparent support for EventSource streaming.  
						
						 
						
						... 
						
						
						
						Port 619da5a4dc  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com > 
						
						
					 
					
						2020-01-24 15:25:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						dc2ab6e646 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places. 
						
						
					 
					
						2020-01-20 18:31:11 +01:00