kPherox
								
							 
						 | 
						
							
							
							
							
								
							
							
								363e76d4da
								
							
						 | 
						
							
							
								
								Fix duplicate recipients
							
							
							
							
							
						 | 
						
							2019-10-30 15:40:25 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c1dd55c48
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
							
							
							
							
							
						 | 
						
							2019-10-24 14:55:36 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82
								
							
						 | 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship
							
							
							
							
							
						 | 
						
							2019-10-11 02:35:32 +07: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6b0fce6e9
								
							
						 | 
						
							
							
								
								Fix/1019 correct count remote users
							
							
							
							
							
						 | 
						
							2019-07-09 17:36:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								b92c004ea8
								
							
						 | 
						
							
							
								
								Reuse query from User.restrict_deactivated/1
							
							
							
							
							
						 | 
						
							2019-05-14 18:29:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e2b491276
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
							
							
							
							
							
						 | 
						
							2019-05-14 18:15:56 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfeb33e951
								
							
						 | 
						
							
							
								
								Merge develop
							
							
							
							
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 | 
						
							2019-05-08 14:34:36 +00:00 | 
						
						
							
							
							
								
							
							
						 |