Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								10ff01acd9
								
							
						 | 
						
							
							
								
								[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
							
							
							
							
							
						 | 
						
							2019-10-16 21:59:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed in 2019
							
							
							
							
							
							
							
							Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' 
							
						 | 
						
							2019-09-18 23:21:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfeb33e951
								
							
						 | 
						
							
							
								
								Merge develop
							
							
							
							
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 | 
						
							2019-05-08 14:34:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cf7539bca
								
							
						 | 
						
							
							
								
								Add more user filters + move search to its own module
							
							
							
							
							
						 | 
						
							2019-03-27 03:51:59 +05:00 | 
						
						
							
							
							
								
							
							
						 |