| 
								
								
									 lambda | bda25b999b | Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc' # Conflicts:
#   lib/mix/tasks/pleroma/uploads.ex | 2018-12-10 18:33:36 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | e94c3442f4 | updates | 2018-12-10 13:27:37 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 993c8c8bd4 | Keep the shortdoc descriptive | 2018-12-10 08:03:17 +03:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | cbe048bb3f | Mix tasks: improve uploads.ex moduledoc | 2018-12-09 20:17:35 +01:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 074fa790ba | fix compile warnings | 2018-12-09 20:50:08 +03:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | fd5c7b445f | Fix a typo | 2018-12-07 19:19:14 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | a02e0c18bc | Mix Tasks: Add task uploads.ex for migrating local uploads. | 2018-12-07 15:13:57 +01:00 |  |