UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/lib/mastodon
History
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
 		2019-04-01 21:28:31 +02:00
..
accounts_cli.rb Simplify culling and fix race condition (#10440) 2019-04-01 19:17:21 +02:00
cli_helper.rb
…
domains_cli.rb Fix `tootctl domains crawl` with JSON format output crash (#9820) 2019-01-16 15:47:55 +01:00
emoji_cli.rb Do not remove "dead" domains in tootctl accounts cull (#9108) 2018-10-27 22:56:16 +02:00
feeds_cli.rb Do not remove "dead" domains in tootctl accounts cull (#9108) 2018-10-27 22:56:16 +02:00
media_cli.rb Fix "tootctl media remove" can't count the file size (#9288) 2018-11-16 09:47:40 +01:00
migration_helpers.rb Fix SUPERUSER postgres command (#9877) 2019-01-27 23:56:07 +01:00
premailer_webpack_strategy.rb
…
redis_config.rb
…
search_cli.rb Add `tootctl search deploy` to avoid ugly rake task syntax (#10403) 2019-03-28 02:16:11 +01:00
settings_cli.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
snowflake.rb
…
statuses_cli.rb Add `tootctl statuses remove` to sweep unreferenced statuses (#10063) 2019-03-11 13:45:17 +01:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00