feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								53a7680c16
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'fix/mrf-sample-doc'
							
							
							
							
							
							
							
							# Conflicts:
#   docs/configuration/mrf.md 
							
						 | 
						
							2020-02-18 20:58:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								589bffa57d
								
							
						 | 
						
							
							
								
								Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
							
							
							
							
							
						 | 
						
							2020-02-14 11:06:04 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								31749559e1
								
							
						 | 
						
							
							
								
								Fix MRF docs further. I don't think anyone has actually tested with the old docs.
							
							
							
							
							
						 | 
						
							2020-02-14 11:04:27 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								6caf6a86c5
								
							
						 | 
						
							
							
								
								Apply suggestion to docs/configuration/mrf.md
							
							
							
							
							
						 | 
						
							2020-02-14 16:55:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								88a76d0142
								
							
						 | 
						
							
							
								
								Update suggested path for location of your custom MRF
							
							
							
							
							
						 | 
						
							2020-02-14 10:55:18 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c95b0fab9
								
							
						 | 
						
							
							
								
								Make the sample code actually compile
							
							
							
							
							
						 | 
						
							2020-02-13 15:19:01 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								815f659ed8
								
							
						 | 
						
							
							
								
								Fix MRF documentation
							
							
							
							
							
						 | 
						
							2020-02-07 22:17:08 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								acc62f327d
								
							
						 | 
						
							
							
								
								Rename some directories because MkDocs uses them for categories
							
							
							
							
							
						 | 
						
							2019-10-02 23:28:45 +03:00 | 
						
						
							
							
							
								
							
							
						 |