StefOfficiel
								
							 
						 | 
						
							
							
								
							
							
	f56a025aff
						 | 
						
							
							
								
								
								Update jquery.js
							
							
							
							
							
							
							
							Update jQuery 1.11.1 to 1.11.2 in good branch 
							
						 | 
						
							2015-03-26 23:55:32 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hauke
								
							 
						 | 
						
							
							
								
							
							
	87fa2ee2af
						 | 
						
							
							
								
								
								updated jquery to version 1.11, updated themes frost and diabook where necessary
							
							
							
							
							
						 | 
						
							2014-09-06 16:21:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Simon L'nu
								
							 
						 | 
						
							
							
								
							
							
	3b1d9d9695
						 | 
						
							
							
								
								
								update jquery to 1.7.2; fix some dispy templates to be more in sync with view/
							
							
							
							
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 | 
						
							2012-06-23 13:33:58 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Kampmann
								
							 
						 | 
						
							
							
								
							
							
	355c42cb30
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica
							
							
							
							
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 | 
						
							2012-04-05 13:39:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	8aa2552372
						 | 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
							
							
							
							
							
						 | 
						
							2012-01-18 16:21:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									zottel
								
							 
						 | 
						
							
							
								
							
							
	720787b772
						 | 
						
							
							
								
								
								Switch to jquery 1.7.1
							
							
							
							
							
						 | 
						
							2011-12-12 08:11:35 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	20ca451200
						 | 
						
							
							
								
								
								move js to js folder
							
							
							
							
							
						 | 
						
							2011-09-05 11:15:30 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |