Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
2019-08-30 07:42:50 +02:00
2016-02-20 22:53:20 +01:00
2018-09-16 14:49:15 -04:00
2017-12-03 23:26:40 -08:00
2017-07-27 22:30:27 +02:00
2016-02-25 00:17:01 +01:00
2019-02-20 11:57:08 +01:00
2019-06-06 18:51:46 +02:00
2017-07-27 22:30:27 +02:00
2019-03-30 02:13:42 +01:00
2019-06-12 15:11:00 +02:00
2018-06-26 20:34:12 +02:00
2018-03-12 03:50:40 +01:00
2016-02-20 22:53:20 +01:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status

So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?

Description
No description provided
Readme AGPL-3.0 1.1 GiB
Languages
Ruby 64.4%
JavaScript 17.3%
TypeScript 8.7%
SCSS 4.7%
Haml 4.4%
Other 0.5%