Jeremy Kescher bad37d4102 Merge remote-tracking branch 'upstream/main' ... # Conflicts: # public/android-chrome-192x192.png # public/apple-touch-icon.png # public/browserconfig.xml # public/favicon.ico # public/mstile-150x150.png		2022-06-13 23:47:34 +02:00
..
glitch	Merge remote-tracking branch 'upstream/main'	2022-06-13 23:47:34 +02:00
vanilla	Fix missing javascript in some admin pages	2022-02-12 00:10:28 +01:00