Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		
				
					… 
				
			
			
		Mastodon Glitch Edition
Now with automated deploys!
So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?
- You can view documentation for this project at glitch-soc.github.io/docs/.
- And contributing guidelines are available here and here.
					Languages
				
				
								
								
									Ruby
								
								47.6%
							
						
							
								
								
									JavaScript
								
								23.7%
							
						
							
								
								
									TypeScript
								
								14.7%
							
						
							
								
								
									SCSS
								
								8.8%
							
						
							
								
								
									Haml
								
								3.2%
							
						
							
								
								
									Other
								
								2%