159 Commits

Author	SHA1	Message	Date
Eugen	9f9f4b248e	Merge pull request #887 from valentin2105/master ... add persistance to Postresql container	2017-04-08 11:39:25 +02:00
Valentin Ouvrard	3c48c9ac2e	Merge branch 'master' into master	2017-04-08 15:11:20 +11:00
Shel R	ecf0320a78	Close instance list to additions	2017-04-07 23:51:30 -04:00
Shel R	50910d1543	Merge branch 'master' into patch-1	2017-04-07 23:15:17 -04:00
Shel R	17690f51a2	Merge branch 'master' into add_indigo_zone_instance	2017-04-07 23:09:50 -04:00
Shel R	315ff648c8	Merge branch 'master' into list-oulipo-social	2017-04-07 23:08:41 -04:00
Shel R	63686fd36f	Merge branch 'master' into patch-2	2017-04-07 23:05:08 -04:00
Shel R	ae9d2f4a32	Merge branch 'master' into patch-1	2017-04-07 23:03:07 -04:00
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
Valentin Ouvrard	5b571fc434	Merge branch 'master' into master	2017-04-08 13:39:31 +11:00
Valentin Ouvrard	3e4eb9c95f	Merge branch 'master' into master	2017-04-08 13:39:09 +11: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
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
Blake	30903d5f02	Add indigo.zone to list of instances	2017-04-07 14:10:37 -07:00
Mouse Reeve	94536af96d	Adds Oulipo.social to Mastodons list ... This is a Mastodon with a particular constraint about what symbols you can post.	2017-04-07 14:06:49 -07:00
Aguay-val	4c751d25e5	Add mastodon.fun	2017-04-07 20:33:52 +02: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
Sergei Č	8e7d0bda40	Update List-of-Mastodon-instances.md	2017-04-07 11:54:41 +03: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