Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208 
								
							 
						 
						
							
							
								
								dynamic_configuration renaming  
							
							... 
							
							
							
							and moving it from instance settings 
							
						 
						
							2020-01-10 19:34:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							
							
						 
						
							2019-07-12 18:08:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								6d0ae264fc 
								
							 
						 
						
							
							
								
								add listener port and ip option for 'pleroma.instance gen' and enable its test  
							
							
							
						 
						
							2019-07-10 01:46:49 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4f42093220 
								
							 
						 
						
							
							
								
								Remove Uploaders.Swift  
							
							
							
						 
						
							2019-07-03 14:11:04 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3ac5ecbac1 
								
							 
						 
						
							
							
								
								Support RUM indexes in the config generator  
							
							
							
						 
						
							2019-06-22 12:54:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f4009b6706 
								
							 
						 
						
							
							
								
								Fallback to Config if Mix.Config does not exist, even if Config does not  
							
							... 
							
							
							
							exist either
For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine. 
							
						 
						
							2019-06-22 02:29:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								960d6b54e8 
								
							 
						 
						
							
							
								
								use Config in generated config when available  
							
							... 
							
							
							
							Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that. 
							
						 
						
							2019-06-21 22:01:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e76115989a 
								
							 
						 
						
							
							
								
								Move config templates to priv so they can be found in releases  
							
							
							
						 
						
							2019-06-21 19:54:04 +03:00