Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf03634e74
								
							
						 | 
						
							
							
								
								Merge branch 'master' into add-elao-com-instance
							
							
							
							
							
						 | 
						
							2017-04-07 22:34:45 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7d165db5b
								
							
						 | 
						
							
							
								
								Merge branch 'master' into add-infinimatix.net-instance
							
							
							
							
							
						 | 
						
							2017-04-07 22:33:40 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								7632178300
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 22:23:50 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e8c1a1c36
								
							
						 | 
						
							
							
								
								Merge branch 'master' into master
							
							
							
							
							
						 | 
						
							2017-04-07 22:17:53 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b42f717f2
								
							
						 | 
						
							
							
								
								Merge branch 'master' into master
							
							
							
							
							
						 | 
						
							2017-04-07 22:15:55 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								9981972844
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 22:14:08 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf13c97cb2
								
							
						 | 
						
							
							
								
								Merge branch 'master' into master
							
							
							
							
							
						 | 
						
							2017-04-07 22:13:06 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								451b7431c9
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-2
							
							
							
							
							
						 | 
						
							2017-04-07 22:11:24 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								6efaee30b1
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 22:09:55 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								05be34a94b
								
							
						 | 
						
							
							
								
								Merge branch 'master' into master
							
							
							
							
							
						 | 
						
							2017-04-07 22:08:54 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								e51b6bba94
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 22:05:38 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c05f0e630
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 21:59:21 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b7bff04df
								
							
						 | 
						
							
							
								
								Merge branch 'master' into master
							
							
							
							
							
						 | 
						
							2017-04-07 21:54:32 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								5dfc9854f1
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 21:48:19 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d519e6fd1
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 21:44:16 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								065defefac
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 21:42:10 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shel R
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc237d17a7
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-07 21:34:41 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								a872f2f4c6
								
							
						 | 
						
							
							
								
								Merge pull request #1204 from benklop/patch-1
							
							
							
							
							
							
							
							Update Administration-guide.md 
							
						 | 
						
							2017-04-08 01:00:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								32a6f0884c
								
							
						 | 
						
							
							
								
								Merge pull request #1200 from huertanix/patch-2
							
							
							
							
							
							
							
							Update Heroku-guide.md 
							
						 | 
						
							2017-04-08 01:00:06 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ray Alez
								
							 
						 | 
						
							
							
							
							
								
							
							
								f113af5350
								
							
						 | 
						
							
							
								
								Add HackerNewsBot
							
							
							
							
							
							
							
							I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list. 
							
						 | 
						
							2017-04-07 15:56:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									benklop
								
							 
						 | 
						
							
							
							
							
								
							
							
								f578cf8331
								
							
						 | 
						
							
							
								
								Update Administration-guide.md
							
							
							
							
							
							
							
							the syntax for running the rake task wasn't correct. 
							
						 | 
						
							2017-04-07 16:31:50 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									David Huerta
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7ab2204d4
								
							
						 | 
						
							
							
								
								Update Heroku-guide.md
							
							
							
							
							
							
							
							Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit. 
							
						 | 
						
							2017-04-07 17:44:32 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b32b5108e
								
							
						 | 
						
							
							
								
								Merge pull request #1191 from d3vgru/master
							
							
							
							
							
							
							
							change suggested cipher for nginx 
							
						 | 
						
							2017-04-07 23:02:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2f024147c
								
							
						 | 
						
							
							
								
								Merge pull request #1172 from mjankowski/mj-heroku-docs
							
							
							
							
							
							
							
							Update heroku instructions 
							
						 | 
						
							2017-04-07 22:50:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									seekr
								
							 
						 | 
						
							
							
							
							
								
							
							
								131f505fd0
								
							
						 | 
						
							
							
								
								typo
							
							
							
							
							
						 | 
						
							2017-04-07 16:33:13 -03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ed Knutson
								
							 
						 | 
						
							
							
							
							
								
							
							
								27012aaeb6
								
							
						 | 
						
							
							
								
								change suggested cipher for nginx
							
							
							
							
							
						 | 
						
							2017-04-07 14:10:39 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matt Jankowski
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f4fa59812
								
							
						 | 
						
							
							
								
								Update heroku instructions
							
							
							
							
							
						 | 
						
							2017-04-07 12:50:29 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									foxiehkins
								
							 
						 | 
						
							
							
							
							
								
							
							
								41396de7a9
								
							
						 | 
						
							
							
								
								Merge branch 'master' into master
							
							
							
							
							
						 | 
						
							2017-04-07 14:01:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jantso Porali
								
							 
						 | 
						
							
							
							
							
								
							
							
								786e6f94b9
								
							
						 | 
						
							
							
								
								Update Finnish translations, add sample Minio config (#954)
							
							
							
							
							
						 | 
						
							2017-04-07 12:58:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								c392c54271
								
							
						 | 
						
							
							
								
								Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
							
							
							
							
							
							
							
							Cosmetic changes to the scalingo deployment 
							
						 | 
						
							2017-04-06 19:32:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									VirtuBox
								
							 
						 | 
						
							
							
							
							
								
							
							
								c441208e29
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-04-06 19:11:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3d204e982
								
							
						 | 
						
							
							
								
								Linux users must enable NFS for Vagrant
							
							
							
							
							
						 | 
						
							2017-04-06 12:16:39 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Guewen FAIVRE
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								83530f0eef
								
							
						 | 
						
							
							
								
								Add mastodon.elao.com instance
							
							
							
							
							
						 | 
						
							2017-04-06 08:46:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Derek Lewis
								
							 
						 | 
						
							
							
							
							
								
							
							
								73b8e67f4b
								
							
						 | 
						
							
							
								
								Add infinimatix.net to instance list
							
							
							
							
							
						 | 
						
							2017-04-06 01:15:16 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nick Gerakines
								
							 
						 | 
						
							
							
							
							
								
							
							
								d025c5e593
								
							
						 | 
						
							
							
								
								Added off-the-clock.us to the list of instances
							
							
							
							
							
						 | 
						
							2017-04-05 19:19:44 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ninetailed
								
							 
						 | 
						
							
							
							
							
								
							
							
								7aede8e720
								
							
						 | 
						
							
							
								
								Description in instance list for mastodon.ninetailed.uk
							
							
							
							
							
						 | 
						
							2017-04-05 22:35:35 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut (Eychics)
								
							 
						 | 
						
							
							
							
							
								
							
							
								eb98c99924
								
							
						 | 
						
							
							
								
								Add mastodon.nuzgo.net
							
							
							
							
							
						 | 
						
							2017-04-05 20:45:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ava
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b41fb2e6f
								
							
						 | 
						
							
							
								
								Update List-of-Mastodon-instances.md
							
							
							
							
							
						 | 
						
							2017-04-05 21:44:13 +03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brad Janke
								
							 
						 | 
						
							
							
							
							
								
							
							
								65b3a2a5a6
								
							
						 | 
						
							
							
								
								Adds mtndevelopment
							
							
							
							
							
						 | 
						
							2017-04-05 13:14:27 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ben Field
								
							 
						 | 
						
							
							
							
							
								
							
							
								8fa8004a2b
								
							
						 | 
						
							
							
								
								Update List-of-Mastodon-instances.md
							
							
							
							
							
						 | 
						
							2017-04-05 18:20:08 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Gilbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5566ac6a6
								
							
						 | 
						
							
							
								
								Add Rich.GOP
							
							
							
							
							
						 | 
						
							2017-04-05 13:05:27 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									foxiehkins
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac1989d2c0
								
							
						 | 
						
							
							
								
								Update description on good-dragon.com
							
							
							
							
							
						 | 
						
							2017-04-05 17:49:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									foxiehkins
								
							 
						 | 
						
							
							
							
							
								
							
							
								32d4b51939
								
							
						 | 
						
							
							
								
								Add good-dragon.com
							
							
							
							
							
						 | 
						
							2017-04-05 17:47:52 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Alberola
								
							 
						 | 
						
							
							
							
							
								
							
							
								b38bd58921
								
							
						 | 
						
							
							
								
								Adding masto.raildecake.fr, french instance 🌻🐘
							
							
							
							
							
						 | 
						
							2017-04-05 18:15:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ZiiX
								
							 
						 | 
						
							
							
							
							
								
							
							
								96812a6c79
								
							
						 | 
						
							
							
								
								added instance
							
							
							
							
							
						 | 
						
							2017-04-05 09:05:57 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Amanda Visconti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a31f5765af
								
							
						 | 
						
							
							
								
								Added digitalhumanities.club instance
							
							
							
							
							
						 | 
						
							2017-04-05 12:04:21 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Toby Deshane
								
							 
						 | 
						
							
							
							
							
								
							
							
								9cf0b5b255
								
							
						 | 
						
							
							
								
								Add social.bytestemplar.com to instances list
							
							
							
							
							
						 | 
						
							2017-04-05 11:49:36 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonathan Hurter
								
							 
						 | 
						
							
							
							
							
								
							
							
								b8218ca482
								
							
						 | 
						
							
							
								
								Make scalingo doc clearer
							
							
							
							
							
						 | 
						
							2017-04-05 17:48:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Kody
								
							 
						 | 
						
							
							
							
							
								
							
							
								4de3182dc8
								
							
						 | 
						
							
							
								
								Added im-in.space
							
							
							
							
							
						 | 
						
							2017-04-05 17:00:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shel
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee758551d1
								
							
						 | 
						
							
							
								
								Correct innacurate info and other fixes
							
							
							
							
							
							
							
							This guide was pretty out of date and also contained outright errors which were never true. I have updated it. 
							
						 | 
						
							2017-04-05 10:58:41 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |