FezVrasta
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a92b3b471
							
						
					 | 
					
						
						
							
							Merge branch 'develop'
						
						
						
						
						
						
						
						Conflicts:
	dist/css/material-wfont.css
	dist/css/material-wfont.min.css
	dist/css/material.css
	dist/css/material.min.css
	less/material.less
	template/material/css/material-wfont.css
	template/material/css/material-wfont.min.css
	template/material/css/material.css
	template/material/css/material.min.css 
						
					 | 
					
						2014-10-17 13:00:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phuc Nguyen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a01c08ad84
							
						
					 | 
					
						
						
							
							Trying to fix issue with ripple effect on card image
						
						
						
						
						
					 | 
					
						2014-10-13 16:58:48 +07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phuc Nguyen
							
						 
					 | 
					
						
						
						
						
							
						
						
							881513c029
							
						
					 | 
					
						
						
							
							Add styling for cards (first draft)
						
						
						
						
						
					 | 
					
						2014-10-12 17:28:11 +07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shockwork
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d56a5a462
							
						
					 | 
					
						
						
							
							jshint no longer checks *.min.js, pre master merge
						
						
						
						
						
					 | 
					
						2014-10-05 11:26:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								FezVrasta
							
						 
					 | 
					
						
						
						
						
							
						
						
							4964878091
							
						
					 | 
					
						
						
							
							refactor of example template to reflect dist changes
						
						
						
						
						
					 | 
					
						2014-10-05 09:41:29 +02:00 | 
					
					
						
						
							
							
							
						
					 |