tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-26 20:43:56 -05:00

History

Thibaut Girka a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.

2018-10-29 14:00:41 +01:00

2018-10-26 20:41:43 +02:00

2018-10-28 20:36:55 +01:00

Theme: Windows 95

2018-01-05 16:22:58 -08:00

2018-07-09 07:13:59 +02:00

2017-12-10 11:08:04 -08:00

2018-10-29 14:00:41 +01:00

2018-10-26 20:41:43 +02:00

2018-05-07 17:00:02 +02:00

2018-10-28 08:37:49 +01:00