Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c94b1a00a
							
						
					 | 
					
						
						
							
							[update] bootstrap.min.css
						
						
						
						
						
					 | 
					
						2015-01-18 13:55:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f00ce8527
							
						
					 | 
					
						
						
							
							Revert: [enh] add new bootstrap-themes to oscar-template
						
						
						
						
						
					 | 
					
						2015-01-18 13:54:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							096ffd0659
							
						
					 | 
					
						
						
							
							[enh] add new bootstrap-themes to oscar-template
						
						
						
						
						
					 | 
					
						2015-01-18 12:00:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Tauber
							
						 
					 | 
					
						
						
						
						
							
						
						
							a04fafd419
							
						
					 | 
					
						
						
							
							Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
						
						
						
						
						
						
						
						Conflicts:
	searx/static/themes/default/css/style.css
	searx/static/themes/oscar/css/oscar.min.css
	searx/templates/oscar/result_templates/torrent.html 
						
					 | 
					
						2015-01-15 18:26:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Tauber
							
						 
					 | 
					
						
						
						
						
							
						
						
							410dbc573b
							
						
					 | 
					
						
						
							
							[enh] static content generalization
						
						
						
						
						
					 | 
					
						2015-01-12 14:54:16 +01:00 | 
					
					
						
						
							
							
							
						
					 |