]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoAdd comment to settings.yml to nudge admins towards editing values via Web UI (#1289)
R Tucker [Sun, 9 Apr 2017 16:34:29 +0000 (12:34 -0400)]
Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289)

* Put a useful message for new admins on /about/more

I totally failed to realize this file was just defaults.  I think
this message would be a good default for people like me.

* Revert default site description, expand comment

This will keep setup-related stuff from leaking into public views,
while still hopefully keeping over-eager admins from editing this
file unnecessarily before RTFMing.  (e.g., me)

8 years agoAllow users to update their Account in the API (#1179)
David Celis [Sun, 9 Apr 2017 16:33:40 +0000 (09:33 -0700)]
Allow users to update their Account in the API (#1179)

* Allow users to update their Account in the API

It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.

Signed-off-by: David Celis <me@davidcel.is>
* Add /api/v1/accounts/update_credentials to the API docs

Signed-off-by: David Celis <me@davidcel.is>
8 years agoHelper cleanup (#1348)
Matt Jankowski [Sun, 9 Apr 2017 15:11:37 +0000 (11:11 -0400)]
Helper cleanup (#1348)

* Remove unused helper files

* Add coverage for application helper

* Add coverage for StreamEntriesHelper #display_name

8 years agoUpdate fr.jsx (#1329)
StefOfficiel [Sun, 9 Apr 2017 12:58:08 +0000 (14:58 +0200)]
Update fr.jsx (#1329)

* Update fr.jsx

* Remove duplicate translation

8 years agoFrench translation update (#1271)
Olivier Humbert [Sun, 9 Apr 2017 12:55:58 +0000 (14:55 +0200)]
French translation update (#1271)

* Update confirmation_instructions.fr.html.erb

consistency across the French translation

* Update

consistency across the French translation

* Update fr.yml

a bunch of consistency across the French translation + a few typos

* Update doorkeeper.fr.yml

consistency across the French translation (punctuation)

8 years agoFrench typo (#1257)
spf [Sun, 9 Apr 2017 12:54:47 +0000 (14:54 +0200)]
French typo (#1257)

* French typo

* Datetime french translation

8 years agoadd empty notifications french translation (#1111)
Jonathan Klee [Sun, 9 Apr 2017 12:54:02 +0000 (14:54 +0200)]
add empty notifications french translation (#1111)

8 years agoClean up about page (#1282)
Matt Jankowski [Sun, 9 Apr 2017 12:47:25 +0000 (08:47 -0400)]
Clean up about page (#1282)

* Add InstancePresenter to expose site details

* Clean up about controller, use instance presenter

8 years agoFixes #1311 margin shouldn't stay fixed (#1312)
Brian Mock [Sun, 9 Apr 2017 12:45:26 +0000 (05:45 -0700)]
Fixes #1311 margin shouldn't stay fixed (#1312)

8 years agoSearch cleanup (#1333)
Matt Jankowski [Sun, 9 Apr 2017 12:45:01 +0000 (08:45 -0400)]
Search cleanup (#1333)

* Clean up SQL output in Tag and Account search methods

* Add basic coverage for Tag.search_for

* Add coverage for Account.search_for

* Add coverage for Account.advanced_search_for

8 years agoIgnore implied formats for catch all route requests (#1340)
Matt Jankowski [Sun, 9 Apr 2017 12:39:41 +0000 (08:39 -0400)]
Ignore implied formats for catch all route requests (#1340)

A request to `/test` would show the custom 404 page, but a request to
`/test.test` would return a 404 with an empty body.

This change ignores the format on incoming catch all route requests, so that the
html 404 page is returned on these requests.

8 years agoFix nonworking clear notices button (#1316)
Rachel H [Sun, 9 Apr 2017 09:35:23 +0000 (02:35 -0700)]
Fix nonworking clear notices button (#1316)

8 years agoAdd env variable to disable prepared statements (#1293)
Eugen [Sun, 9 Apr 2017 03:46:32 +0000 (05:46 +0200)]
Add env variable to disable prepared statements (#1293)

8 years agoAllows setting log level in env variable (#1290)
Ash Furrow [Sat, 8 Apr 2017 23:42:13 +0000 (19:42 -0400)]
Allows setting log level in env variable (#1290)

* Allows setting log level in env variable.

* Made changes based on feedback in #1290.

8 years agoAdds user confirmation rake task (#1300)
Ash Furrow [Sat, 8 Apr 2017 23:09:46 +0000 (19:09 -0400)]
Adds user confirmation rake task (#1300)

* Adds task to confirm user by email.

* Adds documentation for manual confirmation.

8 years agoMake public timelines API not require user context/app credentials (#1291)
Eugen [Sat, 8 Apr 2017 21:39:31 +0000 (23:39 +0200)]
Make public timelines API not require user context/app credentials (#1291)

* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API

* Apply pagination fix to more APIs

8 years agoFix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
Eugen [Sat, 8 Apr 2017 20:20:08 +0000 (22:20 +0200)]
Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)

* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up

8 years agoImprove responsiveness of registration form and closed banner (#1265)
Pavel Djundik [Sat, 8 Apr 2017 16:31:50 +0000 (19:31 +0300)]
Improve responsiveness of registration form and closed banner (#1265)

8 years agoImprove about page responsiveness (#1252)
Pavel Djundik [Sat, 8 Apr 2017 13:28:23 +0000 (16:28 +0300)]
Improve about page responsiveness (#1252)

8 years agoAdd mst3k.interlinked.me to list of instances (#1235)
Elizabeth Myers [Sat, 8 Apr 2017 11:48:16 +0000 (06:48 -0500)]
Add mst3k.interlinked.me to list of instances (#1235)

8 years agoFix #1141, fix #1126 - Avatar/profile info fetching (#1215)
Eugen [Sat, 8 Apr 2017 11:26:03 +0000 (13:26 +0200)]
Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)

* Fix #1141, fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags

* Improve code quality, remove line unrelated to fix

8 years agoUpdate french translation (#1148)
Thomas Citharel [Sat, 8 Apr 2017 11:11:16 +0000 (13:11 +0200)]
Update french translation (#1148)

Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
8 years agoAdd titles to more icons, and change clear notifications icon. (#1101)
Markus Amalthea Magnuson [Sat, 8 Apr 2017 11:07:55 +0000 (13:07 +0200)]
Add titles to more icons, and change clear notifications icon. (#1101)

8 years agoUpdate mastodon.brussels instance name on List of Instances
kadiix [Sat, 8 Apr 2017 11:05:49 +0000 (13:05 +0200)]
Update mastodon.brussels instance name on List of Instances

Correct mastodon.brussels.fr to mastodon.brussels

8 years agoUpdated German translation (#1248)
Nicolai von Neudeck [Sat, 8 Apr 2017 11:04:58 +0000 (13:04 +0200)]
Updated German translation (#1248)

Fixed various spelling and grammar mistakes.
Used more gender-neutral language.

8 years agoFixed two translation errors (#1139)
Sebastian Hübner [Sat, 8 Apr 2017 11:03:11 +0000 (13:03 +0200)]
Fixed two translation errors (#1139)

Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx

8 years agoUpdate simple_form.de.yml (#971)
Korbinian [Sat, 8 Apr 2017 11:02:07 +0000 (13:02 +0200)]
Update simple_form.de.yml (#971)

8 years agoUpdate mastodon.nuzgo.net (#1242)
Thibaut (Eychics) [Sat, 8 Apr 2017 10:34:53 +0000 (12:34 +0200)]
Update mastodon.nuzgo.net (#1242)

Add ipv6 support

8 years agoAdd OTP_SECRET to Heroku app.json (#1246)
James Smith [Sat, 8 Apr 2017 10:31:33 +0000 (11:31 +0100)]
Add OTP_SECRET to Heroku app.json (#1246)

8 years agoRevert "add persistance to Postresql container" (#1251)
Eugen [Sat, 8 Apr 2017 10:25:23 +0000 (12:25 +0200)]
Revert "add persistance to Postresql container" (#1251)

8 years agoUpdated about page in Finnish language (#1170)
Jantso Porali [Sat, 8 Apr 2017 10:17:34 +0000 (12:17 +0200)]
Updated about page in Finnish language (#1170)

* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

8 years agoFrench translation update (#1188)
Olivier Humbert [Sat, 8 Apr 2017 10:16:49 +0000 (12:16 +0200)]
French translation update (#1188)

* Update fr.yml

one typo fix

* Update simple_form.fr.yml

one translation consistency

8 years agoAdd some missing strings to prevent some React warning in the console (#1230)
Alda Marteau-Hardi [Sat, 8 Apr 2017 10:16:16 +0000 (12:16 +0200)]
Add some missing strings to prevent some React warning in the console (#1230)

8 years agoUse Setting.site_title value for `og:site_name` occurrences (#1194)
Matt Jankowski [Sat, 8 Apr 2017 10:15:40 +0000 (06:15 -0400)]
Use Setting.site_title value for `og:site_name` occurrences (#1194)

* Add helper method to return Setting.site_title

* Use site_title helper in application layout

* Use site_title value for og:site_name

8 years agoMerge pull request #1239 from ineffyble/patch-2
Eugen [Sat, 8 Apr 2017 09:40:43 +0000 (11:40 +0200)]
Merge pull request #1239 from ineffyble/patch-2

Fix my URL

8 years agoMerge pull request #1238 from milmazz/hunter-client
Eugen [Sat, 8 Apr 2017 09:40:20 +0000 (11:40 +0200)]
Merge pull request #1238 from milmazz/hunter-client

Add reference to Elixir client for Mastodon API

8 years agoMerge pull request #887 from valentin2105/master
Eugen [Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)]
Merge pull request #887 from valentin2105/master

add persistance to Postresql container

8 years agoMerge pull request #1115 from vmincev/patch-1
Eugen [Sat, 8 Apr 2017 09:38:54 +0000 (11:38 +0200)]
Merge pull request #1115 from vmincev/patch-1

Update Production-guide.md

8 years agoMerge pull request #1198 from huertanix/patch-1
Eugen [Sat, 8 Apr 2017 09:38:33 +0000 (11:38 +0200)]
Merge pull request #1198 from huertanix/patch-1

Update Heroku-guide.md

8 years agoMerge pull request #1221 from rbaumert/patch-1
Eugen [Sat, 8 Apr 2017 09:37:51 +0000 (11:37 +0200)]
Merge pull request #1221 from rbaumert/patch-1

fixed a sentence in readme

8 years agoMerge pull request #1224 from chrisheninger/patch-1
Eugen [Sat, 8 Apr 2017 09:37:37 +0000 (11:37 +0200)]
Merge pull request #1224 from chrisheninger/patch-1

Add SVG version of logo to repo

8 years agoMerge pull request #1218 from R0ckweb/patch-2
Eugen [Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)]
Merge pull request #1218 from R0ckweb/patch-2

Fix #1141 on remote follow

8 years agoMerge pull request #1216 from tootsuite/fix-default-locale-regression
Eugen [Sat, 8 Apr 2017 09:36:43 +0000 (11:36 +0200)]
Merge pull request #1216 from tootsuite/fix-default-locale-regression

Fix #1165 - Default locale no longer breaks form submissions

8 years agoMerge pull request #1213 from tootsuite/fix-accounts-initial-case
Eugen [Sat, 8 Apr 2017 09:36:35 +0000 (11:36 +0200)]
Merge pull request #1213 from tootsuite/fix-accounts-initial-case

Fix #801 - Respect webfinger's canonical response of username/domain

8 years agoMerge pull request #1225 from tootsuite/yiskah-patch-1
Eugen [Sat, 8 Apr 2017 09:35:40 +0000 (11:35 +0200)]
Merge pull request #1225 from tootsuite/yiskah-patch-1

Close instance list to additions

8 years agoAdd reference to Elixir client for Mastodon API
Milton Mazzarri [Sat, 8 Apr 2017 07:48:52 +0000 (02:48 -0500)]
Add reference to Elixir client for Mastodon API

8 years agoFix my URL
Effy Elden [Sat, 8 Apr 2017 06:22:07 +0000 (16:22 +1000)]
Fix my URL

Update my URL since toot.zone was shut down.

8 years agoMerge branch 'master' into patch-1
rbaumert [Sat, 8 Apr 2017 04:39:24 +0000 (21:39 -0700)]
Merge branch 'master' into patch-1

8 years agoMerge branch 'master' into master
Valentin Ouvrard [Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)]
Merge branch 'master' into master

8 years agoClose instance list to additions
Shel R [Sat, 8 Apr 2017 03:51:30 +0000 (23:51 -0400)]
Close instance list to additions

8 years agoMerge branch 'master' into fix-default-locale-regression
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:50:21 +0000 (20:50 -0700)]
Merge branch 'master' into fix-default-locale-regression

8 years agoMerge branch 'master' into patch-2
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:48:27 +0000 (20:48 -0700)]
Merge branch 'master' into patch-2

8 years agoAdd SVG version of logo to repo
Chris Heninger [Sat, 8 Apr 2017 03:40:18 +0000 (20:40 -0700)]
Add SVG version of logo to repo

8 years agoMerge pull request #1137 from Noiwex/patch-1
Shel R [Sat, 8 Apr 2017 03:16:46 +0000 (23:16 -0400)]
Merge pull request #1137 from Noiwex/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 03:15:17 +0000 (23:15 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1197 from blakebarnett/add_indigo_zone_instance
Shel R [Sat, 8 Apr 2017 03:10:25 +0000 (23:10 -0400)]
Merge pull request #1197 from blakebarnett/add_indigo_zone_instance

Add indigo.zone to list of instances

8 years agoMerge branch 'master' into add_indigo_zone_instance
Shel R [Sat, 8 Apr 2017 03:09:50 +0000 (23:09 -0400)]
Merge branch 'master' into add_indigo_zone_instance

8 years agoMerge pull request #1196 from mouse-reeve/list-oulipo-social
Shel R [Sat, 8 Apr 2017 03:09:09 +0000 (23:09 -0400)]
Merge pull request #1196 from mouse-reeve/list-oulipo-social

Adds Oulipo.social to Mastodons list

8 years agoMerge branch 'master' into list-oulipo-social
Shel R [Sat, 8 Apr 2017 03:08:41 +0000 (23:08 -0400)]
Merge branch 'master' into list-oulipo-social

8 years agoMerge pull request #1186 from Aguay-val/patch-2
Shel R [Sat, 8 Apr 2017 03:07:50 +0000 (23:07 -0400)]
Merge pull request #1186 from Aguay-val/patch-2

Add mastodon.fun

8 years agoMerge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 03:05:08 +0000 (23:05 -0400)]
Merge branch 'master' into patch-2

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 03:03:07 +0000 (23:03 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:59:07 +0000 (22:59 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1107 from YDrogen/patch-1
Shel R [Sat, 8 Apr 2017 02:54:44 +0000 (22:54 -0400)]
Merge pull request #1107 from YDrogen/patch-1

Added masto.razrnet.fr

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:54:25 +0000 (22:54 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1090 from gled-rs/master
Shel R [Sat, 8 Apr 2017 02:54:14 +0000 (22:54 -0400)]
Merge pull request #1090 from gled-rs/master

Added mastodon.host in the list of instances

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:53:42 +0000 (22:53 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1085 from isati/patch-2
Shel R [Sat, 8 Apr 2017 02:49:34 +0000 (22:49 -0400)]
Merge pull request #1085 from isati/patch-2

Add manx.social instance

8 years agoMerge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 02:49:14 +0000 (22:49 -0400)]
Merge branch 'master' into patch-2

8 years agofixed a sentence in readme
rbaumert [Sat, 8 Apr 2017 02:48:46 +0000 (19:48 -0700)]
fixed a sentence in readme

8 years agoMerge pull request #1084 from genesixx/patch-4
Shel R [Sat, 8 Apr 2017 02:48:02 +0000 (22:48 -0400)]
Merge pull request #1084 from genesixx/patch-4

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-4
Shel R [Sat, 8 Apr 2017 02:47:42 +0000 (22:47 -0400)]
Merge branch 'master' into patch-4

8 years agoMerge pull request #1074 from kadiix/patch-1
Shel R [Sat, 8 Apr 2017 02:47:00 +0000 (22:47 -0400)]
Merge pull request #1074 from kadiix/patch-1

Add an instance.

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:46:36 +0000 (22:46 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1069 from Awea/master
Shel R [Sat, 8 Apr 2017 02:45:15 +0000 (22:45 -0400)]
Merge pull request #1069 from Awea/master

Add an instance

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:44:40 +0000 (22:44 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1066 from jack-michaud/master
Shel R [Sat, 8 Apr 2017 02:43:46 +0000 (22:43 -0400)]
Merge pull request #1066 from jack-michaud/master

Add Northeastern University Mastodon

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:43:13 +0000 (22:43 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1051 from Tiwy57/patch-1
Shel R [Sat, 8 Apr 2017 02:42:34 +0000 (22:42 -0400)]
Merge pull request #1051 from Tiwy57/patch-1

Add an instance

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:42:14 +0000 (22:42 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1050 from lfuelling/patch-1
Shel R [Sat, 8 Apr 2017 02:41:37 +0000 (22:41 -0400)]
Merge pull request #1050 from lfuelling/patch-1

add my instance

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:41:07 +0000 (22:41 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1046 from raymestalez/patch-2
Shel R [Sat, 8 Apr 2017 02:40:29 +0000 (22:40 -0400)]
Merge pull request #1046 from raymestalez/patch-2

Added an instance to the list

8 years agoMerge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 02:39:59 +0000 (22:39 -0400)]
Merge branch 'master' into patch-2

8 years agoMerge branch 'master' into master
Valentin Ouvrard [Sat, 8 Apr 2017 02:39:31 +0000 (13:39 +1100)]
Merge branch 'master' into master

8 years agoMerge branch 'master' into master
Valentin Ouvrard [Sat, 8 Apr 2017 02:39:09 +0000 (13:39 +1100)]
Merge branch 'master' into master

8 years agoMerge pull request #1041 from R0ckweb/patch-1
Shel R [Sat, 8 Apr 2017 02:39:05 +0000 (22:39 -0400)]
Merge pull request #1041 from R0ckweb/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1036 from wirehack7/patch-1
Shel R [Sat, 8 Apr 2017 02:37:51 +0000 (22:37 -0400)]
Merge pull request #1036 from wirehack7/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:35:45 +0000 (22:35 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1035 from gfaivre/add-elao-com-instance
Shel R [Sat, 8 Apr 2017 02:35:08 +0000 (22:35 -0400)]
Merge pull request #1035 from gfaivre/add-elao-com-instance

Add mastodon.elao.com instance

8 years agoMerge branch 'master' into add-elao-com-instance
Shel R [Sat, 8 Apr 2017 02:34:45 +0000 (22:34 -0400)]
Merge branch 'master' into add-elao-com-instance

8 years agoMerge pull request #1030 from derekcecillewis/add-infinimatix.net-instance
Shel R [Sat, 8 Apr 2017 02:34:10 +0000 (22:34 -0400)]
Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance

Add infinimatix.net to instance list

8 years agoMerge branch 'master' into add-infinimatix.net-instance
Shel R [Sat, 8 Apr 2017 02:33:40 +0000 (22:33 -0400)]
Merge branch 'master' into add-infinimatix.net-instance

8 years agoMerge pull request #1009 from ngerakines/patch-1
Shel R [Sat, 8 Apr 2017 02:25:45 +0000 (22:25 -0400)]
Merge pull request #1009 from ngerakines/patch-1

Added off-the-clock.us to the list of instances

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:23:50 +0000 (22:23 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #797 from AndreLewin/master
Shel R [Sat, 8 Apr 2017 02:21:48 +0000 (22:21 -0400)]
Merge pull request #797 from AndreLewin/master

Added Esperanto translation (eo)

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:21:21 +0000 (22:21 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1006 from Ninetailed/master
Shel R [Sat, 8 Apr 2017 02:18:11 +0000 (22:18 -0400)]
Merge pull request #1006 from Ninetailed/master

Description in instance list for mastodon.ninetailed.uk

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:17:53 +0000 (22:17 -0400)]
Merge branch 'master' into master