Thibaut Girka
a9eaa780f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
2019-04-22 20:40:04 +02:00
..
2018-12-01 17:39:13 +01:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-08 21:12:06 +09:00
2019-04-10 14:52:08 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-08 21:14:08 +09:00
2019-04-08 15:57:56 +02:00
2019-04-10 18:17:24 +02:00
2019-04-08 15:57:56 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-21 04:52:20 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-21 04:48:47 +02:00
2019-04-10 18:17:24 +02:00
2017-11-20 22:13:37 -08:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-08 15:57:56 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-08 12:35:37 +09:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-21 04:46:08 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 21:19:21 +02:00
2019-04-13 21:23:41 +09:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-21 04:52:20 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2017-05-07 19:55:47 +02:00
2018-07-24 20:47:13 +02:00
2017-05-07 19:55:47 +02:00
2019-03-24 18:44:59 +01:00
2017-05-17 17:50:39 +02:00
2018-05-07 01:34:19 +02:00
2018-07-11 01:14:38 +02:00
2018-08-31 04:28:29 +02:00
2018-07-11 01:14:38 +02:00
2017-05-07 19:55:47 +02:00
2018-05-03 15:54:10 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-05-03 15:54:10 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-12-09 15:35:22 +01:00
2017-05-07 19:55:47 +02:00
2019-04-21 04:52:20 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-01-22 14:20:58 +01:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-06-13 03:55:28 +02:00
2018-08-18 01:00:01 +09:00
2019-02-23 18:41:28 +01:00
2017-07-04 16:11:23 +02:00
2019-01-08 14:09:57 +01:00
2018-12-22 23:32:00 +01:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-09-02 03:14:46 +02:00
2017-05-07 19:55:47 +02:00
2018-01-03 21:00:39 +09:00
2018-05-10 14:48:26 +02:00
2019-02-11 07:41:35 +01:00
2018-01-05 04:43:50 +01:00
2018-01-03 21:00:39 +09:00
2017-11-25 03:39:57 +01:00
2018-09-02 18:20:26 +02:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-09 14:12:35 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-07-10 14:02:18 +02:00
2017-05-30 23:09:02 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00
2019-04-10 18:17:24 +02:00