You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		6 years ago
..
accounts_cli.rb	Fix tootctl accounts reattaching not unsuspending deleted account (#8812)	6 years ago
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	6 years ago
emoji_cli.rb	Move more tasks to tootctl (#8675)	6 years ago
feeds_cli.rb	Move more tasks to tootctl (#8675)	6 years ago
media_cli.rb	Move more tasks to tootctl (#8675)	6 years ago
migration_helpers.rb	Misc. typos (#8694)	6 years ago
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	6 years ago
redis_config.rb	Add support for separate Redis for cache (#7272)	6 years ago
settings_cli.rb	Add tootctl settings registrations open (#8829)	6 years ago
snowflake.rb	Fixes/do not override timestamps (#7336)	6 years ago
version.rb	Add -glitch suffix to version string	6 years ago