231 Commits

Author	SHA1	Message	Date
Shel R	971c4de18c	Merge branch 'master' into patch-1	2017-04-07 22:54:25 -04:00
Shel R	3c5b0c55cb	Merge branch 'master' into master	2017-04-07 22:53:42 -04:00
Shel R	b67b60fec3	Merge branch 'master' into patch-2	2017-04-07 22:49:14 -04:00
Shel R	d6827e38a6	Merge branch 'master' into patch-4	2017-04-07 22:47:42 -04:00
Shel R	e7d7a99fbc	Merge branch 'master' into patch-1	2017-04-07 22:46:36 -04:00
Shel R	abab82ec1e	Merge branch 'master' into master	2017-04-07 22:44:40 -04:00
Shel R	38c5130930	Merge branch 'master' into master	2017-04-07 22:43:13 -04:00
Shel R	c9f15f7991	Merge branch 'master' into patch-1	2017-04-07 22:42:14 -04:00
Shel R	9edee2e64f	Merge branch 'master' into patch-1	2017-04-07 22:41:07 -04:00
Shel R	c890b86ef6	Merge branch 'master' into patch-2	2017-04-07 22:39:59 -04:00
Shel R	7826b5e93d	Merge branch 'master' into patch-1	2017-04-07 22:38:37 -04:00
Shel R	c945f29e96	Merge branch 'master' into patch-1	2017-04-07 22:35:45 -04:00
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
Tristan Mahé	8a4ff30ceb	updated instance hostname	2017-04-06 17:18:40 -07:00
YDrogen	4b08b7c502	Added masto.razrnet.fr	2017-04-06 23:59:56 +02:00
Tristan Mahé	cfbd90cf44	Added pericles.world in the list of instances	2017-04-06 12:05:37 -07:00
isati	acf6436a99	Add manx.social instance	2017-04-06 19:31:25 +01:00
Erwan Leboucher	a0f1f9c664	Update List-of-Mastodon-instances.md	2017-04-06 20:18:56 +02:00
kadiix	02c1ad5347	Update List-of-Mastodon-instances.md	2017-04-06 19:33:17 +02:00
kadiix	a736b28646	Merge branch 'master' into patch-1	2017-04-06 19:32:31 +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
kadiix	0d5d3c7abe	Add an instance.	2017-04-06 19:15:57 +02:00