Thibaut Girka
5085559b15
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
2018-10-04 12:36:53 +02:00
2018-10-04 17:38:04 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 17:38:04 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2019-02-04 04:25:59 +01:00
2017-10-27 16:11:30 +02:00
2018-10-04 12:36:53 +02:00
2017-11-07 19:06:44 +01:00
2017-11-07 19:06:44 +01:00
2017-11-11 20:23:33 +01:00
2017-11-14 20:37:17 +01:00
2017-11-18 00:16:48 +01:00
2017-11-18 00:16:48 +01:00
2017-11-18 19:39:02 +01:00
2017-11-24 02:05:53 +01:00
2017-11-27 20:22:27 +01:00
2017-11-27 16:07:59 +01:00
2017-11-27 16:07:59 +01:00
2017-11-27 20:22:27 +01:00
2017-11-27 20:22:27 +01:00
2018-01-04 19:38:29 +01:00
2017-12-07 03:37:43 +01:00
2018-08-14 20:24:47 +02:00
2017-12-10 16:41:25 -06:00
2017-12-12 17:38:42 +01:00
2018-01-04 19:38:29 +01:00
2018-01-09 15:00:19 +01:00
2018-02-02 10:18:55 +01:00
2018-02-04 05:42:13 +01:00
2018-02-07 16:35:44 +01:00
2018-02-21 23:21:32 +01:00
2018-03-04 09:19:11 +01:00
2018-03-24 12:51:28 +01:00
2018-04-02 22:04:14 +02:00
2018-04-02 22:04:14 +02:00
2018-04-14 12:41:08 +02:00
2018-04-11 20:40:29 +02:00
2018-05-04 21:14:34 +02:00
2018-05-07 09:31:07 +02:00
2018-05-11 11:49:12 +02:00
2018-05-11 11:49:12 +02:00
2018-06-21 23:07:40 +02:00
2018-07-15 14:56:00 +02:00
2018-08-15 20:23:12 +02:00
2018-06-03 23:00:50 -05:00
2018-06-10 00:38:17 +02:00
2018-06-09 13:33:04 +02:00
2018-06-15 18:00:23 +02:00
2018-06-17 13:54:02 +02:00
2018-06-17 18:49:35 +02:00
2018-06-29 15:34:36 +02:00
2018-07-09 02:22:09 +02:00
2018-08-16 20:30:09 +02:00
2018-07-13 02:16:06 +02:00
2018-08-09 09:56:53 +02:00
2018-08-13 18:17:20 +02:00
2018-08-14 19:19:32 +02:00
2018-10-07 04:40:37 +02:00
2018-08-14 20:24:47 +02:00
2018-08-21 20:11:34 +02:00
2018-10-07 23:44:58 +02:00
2018-10-09 19:35:14 +02:00
2018-10-17 17:13:04 +02:00
2018-10-20 08:02:44 +02:00
2018-10-19 01:47:29 +02:00
2018-10-30 21:09:33 +01:00
2018-10-26 23:08:34 +02:00
2018-11-19 00:43:52 +01:00
2019-01-28 04:18:35 +01:00
2018-11-27 13:56:25 +01:00
2018-11-28 14:46:07 +01:00
2018-12-06 17:36:11 +01:00
2018-12-06 17:36:11 +01:00
2018-12-06 17:36:11 +01:00
2018-12-06 17:36:11 +01:00
2019-01-07 09:47:00 +01:00
2018-12-22 20:02:09 +01:00
2018-12-22 20:02:09 +01:00
2018-12-24 19:12:38 +01:00
2019-01-10 18:46:17 +01:00
2019-01-05 12:43:28 +01:00
2019-01-05 12:43:28 +01:00
2019-01-18 15:56:55 +01:00
2019-02-03 03:59:51 +01:00
2019-02-04 04:25:59 +01:00
2019-03-03 22:18:23 +01:00
2019-03-03 22:18:23 +01:00
2019-03-03 22:18:23 +01:00
2019-03-04 22:51:23 +01:00
2019-03-07 01:50:06 +01:00
2019-03-14 05:28:30 +01:00
2019-03-14 20:10:43 +01:00
2019-03-18 21:00:55 +01:00
2019-03-17 15:34:56 +01:00
2019-04-09 23:06:30 +09:00