 Mikael Nordfeldth
		
	
	980085a8a3
	
	
	Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
			Mikael Nordfeldth
		
	
	980085a8a3
	
	
	Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
		
			
			Conflicts:
	plugins/Minify/extlib/minify/README.txt
	plugins/Minify/extlib/minify/UPGRADING.txt
	plugins/Minify/extlib/minify/min/README.txt
	plugins/Minify/extlib/minify/min/builder/index.php
	plugins/Minify/extlib/minify/min/lib/JSMin.php
	plugins/Minify/extlib/minify/min/lib/Minify.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php
	plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php
	plugins/Minify/extlib/minify/min/lib/Minify/Packer.php
	plugins/Recaptcha/RecaptchaPlugin.php
		
	
 
		2016-03-21 03:10:19 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2016-03-20 13:06:58 +00:00
		 
	
		
			
			
			
			
			
			2013-09-10 13:29:00 +02:00
		 
	
		
			
			
			
			
			
			2010-01-22 21:08:51 +01:00
		 
	
		
			
			
			
			
			
			2013-09-10 13:29:01 +02:00
		 
	
		
			
			
			
			
			
			2013-09-14 13:31:16 +02:00
		 
	
		
			
			
			
			
			
			2016-03-01 18:20:50 +01:00
		 
	
		
			
			
			
			
			
			2010-12-22 15:22:02 -08:00