9981972844
Merge branch 'master' into patch-1
2017-04-07 22:14:08 -04:00
cf13c97cb2
Merge branch 'master' into master
2017-04-07 22:13:06 -04:00
451b7431c9
Merge branch 'master' into patch-2
2017-04-07 22:11:24 -04:00
6efaee30b1
Merge branch 'master' into patch-1
2017-04-07 22:09:55 -04:00
05be34a94b
Merge branch 'master' into master
2017-04-07 22:08:54 -04:00
e51b6bba94
Merge branch 'master' into patch-1
2017-04-07 22:05:38 -04:00
4c05f0e630
Merge branch 'master' into patch-1
2017-04-07 21:59:21 -04:00
7b7bff04df
Merge branch 'master' into master
2017-04-07 21:54:32 -04:00
5dfc9854f1
Merge branch 'master' into patch-1
2017-04-07 21:48:19 -04:00
6d519e6fd1
Merge branch 'master' into patch-1
2017-04-07 21:44:16 -04:00
065defefac
Merge branch 'master' into patch-1
2017-04-07 21:42:10 -04:00
bc237d17a7
Merge branch 'master' into patch-1
2017-04-07 21:34:41 -04:00
4fb24a70d3
Merge branch 'master' into patch-1
2017-04-07 19:46:07 -04:00
a872f2f4c6
Merge pull request #1204 from benklop/patch-1
...
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
32a6f0884c
Merge pull request #1200 from huertanix/patch-2
...
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
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
f578cf8331
Update Administration-guide.md
...
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
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
36a83cc4f9
Update Heroku-guide.md
...
Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.
2017-04-07 17:29:21 -04:00
30903d5f02
Add indigo.zone to list of instances
2017-04-07 14:10:37 -07:00
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
0b32b5108e
Merge pull request #1191 from d3vgru/master
...
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
e2f024147c
Merge pull request #1172 from mjankowski/mj-heroku-docs
...
Update heroku instructions
2017-04-07 22:50:31 +02:00
131f505fd0
typo
2017-04-07 16:33:13 -03:00
27012aaeb6
change suggested cipher for nginx
2017-04-07 14:10:39 -05:00
4c751d25e5
Add mastodon.fun
2017-04-07 20:33:52 +02:00
0f4fa59812
Update heroku instructions
2017-04-07 12:50:29 -04:00
41396de7a9
Merge branch 'master' into master
2017-04-07 14:01:20 +01:00
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
8e7d0bda40
Update List-of-Mastodon-instances.md
2017-04-07 11:54:41 +03:00
8a4ff30ceb
updated instance hostname
2017-04-06 17:18:40 -07:00
56f4a94e7b
Update Production-guide.md
...
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
4b08b7c502
Added masto.razrnet.fr
2017-04-06 23:59:56 +02:00
cfbd90cf44
Added pericles.world in the list of instances
2017-04-06 12:05:37 -07:00
acf6436a99
Add manx.social instance
2017-04-06 19:31:25 +01:00
a0f1f9c664
Update List-of-Mastodon-instances.md
2017-04-06 20:18:56 +02:00
02c1ad5347
Update List-of-Mastodon-instances.md
2017-04-06 19:33:17 +02:00
a736b28646
Merge branch 'master' into patch-1
2017-04-06 19:32:31 +02:00
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
0d5d3c7abe
Add an instance.
2017-04-06 19:15:57 +02:00
c441208e29
Merge branch 'master' into patch-1
2017-04-06 19:11:39 +02:00
a3d204e982
Linux users must enable NFS for Vagrant
2017-04-06 12:16:39 -04:00
07495cc13f
Update List-of-Mastodon-instances.md
2017-04-06 18:07:15 +02:00
6a88151eda
Add meow.social
2017-04-06 14:51:42 +02:00
30619a6716
add my instance
2017-04-06 14:22:01 +02:00
eadac4e7f4
Added an instance to the list
...
Just launched https://hackertribe.io/ , added it to the list.
2017-04-06 03:12:34 -07:00
0209b7d1b5
Update List-of-Mastodon-instances.md
...
Add mastodon.land instance
2017-04-06 11:07:33 +02:00
c62696bc46
Update List-of-Mastodon-instances.md
2017-04-06 08:52:15 +02:00
83530f0eef
Add mastodon.elao.com instance
2017-04-06 08:46:16 +02:00
73b8e67f4b
Add infinimatix.net to instance list
2017-04-06 01:15:16 -04:00
