Commit graph

  • d5998431b1 Merge branch 'master' into patch-2 Shel R 2017-04-07 23:05:08 -0400
  • c6a30c2272 Merge branch 'master' into patch-1 Shel R 2017-04-07 23:03:07 -0400
  • 210477bfb2 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:59:07 -0400
  • 5e52f81d0b Merge branch 'master' into patch-1 Shel R 2017-04-07 22:54:25 -0400
  • 960bf1823f Merge branch 'master' into master Shel R 2017-04-07 22:53:42 -0400
  • b7d1d57035 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:49:14 -0400
  • 6f121ae603 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:47:42 -0400
  • 1cbf83dfd3 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:46:36 -0400
  • da91b207e9 Merge branch 'master' into master Shel R 2017-04-07 22:44:40 -0400
  • 9ef164a3e2 Merge branch 'master' into master Shel R 2017-04-07 22:43:13 -0400
  • 2caa1fa679 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:42:14 -0400
  • 79875f5505 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:41:07 -0400
  • 6c766318ac Merge branch 'master' into patch-2 Shel R 2017-04-07 22:39:59 -0400
  • e08dfa6f32 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:31 +1100
  • 8fb9960e92 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:09 +1100
  • 4062abe596 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:38:37 -0400
  • aa6f267117 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:35:45 -0400
  • 1b964ab4c2 Merge branch 'master' into add-elao-com-instance Shel R 2017-04-07 22:34:45 -0400
  • 95440a1ac3 Merge branch 'master' into add-infinimatix.net-instance Shel R 2017-04-07 22:33:40 -0400
  • aa7ba961c8 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:23:50 -0400
  • 8a46f49140 Merge branch 'master' into master Shel R 2017-04-07 22:17:53 -0400
  • aeb5f657d1 Merge branch 'master' into master Shel R 2017-04-07 22:15:55 -0400
  • 9cdf42ba65 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:14:08 -0400
  • d42ddf0dad Merge branch 'master' into master Shel R 2017-04-07 22:13:06 -0400
  • cc3037296a Merge branch 'master' into patch-2 Shel R 2017-04-07 22:11:24 -0400
  • 05bb90718d Merge branch 'master' into patch-1 Shel R 2017-04-07 22:09:55 -0400
  • 8374ca6182 Merge branch 'master' into master Shel R 2017-04-07 22:08:54 -0400
  • 34ce7c6fb9 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:05:38 -0400
  • fd94a0bece Merge branch 'master' into patch-1 Shel R 2017-04-07 21:59:21 -0400
  • ba611ed3b2 Merge branch 'master' into master Shel R 2017-04-07 21:54:32 -0400
  • 9470afa4f3 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:49:18 -0400
  • f3ee549b28 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:48:19 -0400
  • 7c7851a45c Merge branch 'master' into patch-1 Shel R 2017-04-07 21:44:16 -0400
  • 791dcac706 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:42:10 -0400
  • c388df681f Merge branch 'master' into patch-1 Shel R 2017-04-07 21:34:41 -0400
  • e8e607a356 Merge branch 'master' into patch-1 David Huerta 2017-04-07 19:46:07 -0400
  • 266cf6c3c2 Merge pull request #1204 from benklop/patch-1 Eugen 2017-04-08 01:00:32 +0200
  • ecce87e858 Merge pull request #1200 from huertanix/patch-2 Eugen 2017-04-08 01:00:06 +0200
  • c96ef27f44 Add HackerNewsBot Ray Alez 2017-04-07 15:56:02 -0700
  • be8680df9a Update Administration-guide.md benklop 2017-04-07 16:31:50 -0600
  • 774b752498 Update Heroku-guide.md David Huerta 2017-04-07 17:44:32 -0400
  • 9efa356f9c Update Heroku-guide.md David Huerta 2017-04-07 17:29:21 -0400
  • bf19455cf6 Add indigo.zone to list of instances Blake 2017-04-07 14:10:37 -0700
  • 84b40fa940 Adds Oulipo.social to Mastodons list Mouse Reeve 2017-04-07 14:06:49 -0700
  • b44df8f36c Merge pull request #1191 from d3vgru/master Eugen 2017-04-07 23:02:49 +0200
  • b1501669f9 Merge pull request #1172 from mjankowski/mj-heroku-docs Eugen 2017-04-07 22:50:31 +0200
  • 7123e2cb5a typo seekr 2017-04-07 16:33:13 -0300
  • b130db887e change suggested cipher for nginx Ed Knutson 2017-04-07 14:10:39 -0500
  • 8d5e4d3d74 Add mastodon.fun Aguay-val 2017-04-07 20:33:52 +0200
  • f26e10dd99 Update heroku instructions Matt Jankowski 2017-04-07 11:34:10 -0400
  • e21f876515 Merge branch 'master' into master foxiehkins 2017-04-07 14:01:20 +0100
  • 097db95bd3 Update Finnish translations, add sample Minio config (#954) Jantso Porali 2017-04-07 12:58:12 +0200
  • 976e6797a1 Update List-of-Mastodon-instances.md Sergei Č 2017-04-07 11:54:41 +0300
  • 0bde1b7f4e updated instance hostname Tristan Mahé 2017-04-06 17:18:40 -0700
  • 272d25c383 Update Production-guide.md Vladimir Mincev 2017-04-07 01:05:32 +0200
  • dc2ef960f7 Added masto.razrnet.fr YDrogen 2017-04-06 23:59:56 +0200
  • 0718e1d3dc Added pericles.world in the list of instances Tristan Mahé 2017-04-06 12:05:37 -0700
  • 7053ff9f6d Add manx.social instance isati 2017-04-06 19:31:25 +0100
  • 075411f716 Update List-of-Mastodon-instances.md Erwan Leboucher 2017-04-06 20:18:56 +0200
  • 64fff28022 Update List-of-Mastodon-instances.md kadiix 2017-04-06 19:33:17 +0200
  • de555fdc55 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:32:31 +0200
  • d09a7460b3 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-06 19:32:12 +0200
  • 09d4ec4821 Add an instance. kadiix 2017-04-06 19:15:57 +0200
  • 6aa0cf81bf Merge branch 'master' into patch-1 VirtuBox 2017-04-06 19:11:39 +0200
  • 77924befb2 Linux users must enable NFS for Vagrant Alex Gleason 2017-04-06 12:16:39 -0400
  • 3946a8fda6 Update List-of-Mastodon-instances.md awea 2017-04-06 18:07:15 +0200
  • e2965d2cb1 Add meow.social Julien 2017-04-06 14:51:42 +0200
  • 50d9f65682 add my instance Lukas Fülling 2017-04-06 14:22:01 +0200
  • cca0f11f6d Added an instance to the list Ray Alez 2017-04-06 03:12:34 -0700
  • 53366cfcf3 Update List-of-Mastodon-instances.md Yann GUERN 2017-04-06 11:07:33 +0200
  • d8db9d82c1 Update List-of-Mastodon-instances.md Markus R 2017-04-06 08:52:15 +0200
  • 1cf59cbd8e Add mastodon.elao.com instance Guewen FAIVRE 2017-04-06 08:46:16 +0200
  • 217cf85c93 Add infinimatix.net to instance list Derek Lewis 2017-04-06 01:11:16 -0400
  • 97a5772740 Add Northeastern University Mastodon Jack Michaud 2017-04-05 20:58:21 -0400
  • 88ae4714ff Added off-the-clock.us to the list of instances Nick Gerakines 2017-04-05 19:19:44 -0400
  • 408c29a78b Description in instance list for mastodon.ninetailed.uk Ninetailed 2017-04-05 22:35:35 +0100
  • 8fcaf14e3c Add mastodon.nuzgo.net Thibaut (Eychics) 2017-04-05 20:45:23 +0200
  • 7fdf1f7381 Update List-of-Mastodon-instances.md ava 2017-04-05 21:44:13 +0300
  • a5c7ec3bac Adds mtndevelopment Brad Janke 2017-04-05 13:14:27 -0500
  • c05a3a3569 Update List-of-Mastodon-instances.md Ben Field 2017-04-05 18:20:08 +0100
  • f5a90c886a Add Rich.GOP Christopher Gilbert 2017-04-05 13:05:27 -0400
  • 4e2c148ed6 Update description on good-dragon.com foxiehkins 2017-04-05 17:49:04 +0100
  • 46c54a92b2 Add good-dragon.com foxiehkins 2017-04-05 17:47:52 +0100
  • 6aeaeb8b91 Adding masto.raildecake.fr, french instance 🌻🐘 Thomas Alberola 2017-04-05 18:15:39 +0200
  • 018e2fc68c added instance ZiiX 2017-04-05 09:05:57 -0700
  • 4d226de556 Added digitalhumanities.club instance Amanda Visconti 2017-04-05 12:04:21 -0400
  • 7063dfd8e2 Update Production-guide.md Ben Field 2017-04-05 16:56:51 +0100
  • f150c4923e Add social.bytestemplar.com to instances list Toby Deshane 2017-04-05 11:49:36 -0400
  • c3f536126a Make scalingo doc clearer Jonathan Hurter 2017-04-05 17:48:55 +0200
  • 5c28bc676b Added im-in.space Kody 2017-04-05 17:00:03 +0200
  • 0470be7862 Correct innacurate info and other fixes shel 2017-04-05 10:58:41 -0400
  • 237ff5dd8f Merge pull request #947 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-05 16:50:46 +0200
  • 38c548fc27 Add niu.moe, cuz it's kawaii Technowix 2017-04-05 16:18:52 +0200
  • ef2fa2f3a8 Update List-of-Mastodon-instances.md VirtuBox 2017-04-05 16:02:47 +0200
  • a9265eadda Add doc Jonathan Hurter 2017-04-05 16:00:48 +0200
  • 5e3df4fb44 Merge pull request #940 from fahy/patch-1 Eugen 2017-04-05 15:24:52 +0200
  • 7e32d74422 Merge pull request #930 from nicobz25/patch-1 Eugen 2017-04-05 15:24:40 +0200
  • 9bd27e6882 Adding mastodon.irish Padraig Fahy 2017-04-05 14:00:35 +0100
  • 84930a6fd9 Merge pull request #938 from wxcafe/patch-3 Eugen 2017-04-05 14:57:38 +0200
  • c9713e0cd0 Merge pull request #931 from farlistener/patch-3 Eugen 2017-04-05 14:57:14 +0200