Wolfgang Huß 8b5bc6dbeb Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 7114-implement-ocelot-color-tokens-in-frontend-with-theme ...

# Conflicts:
#	frontend/renderer/plugins/vuetify.ts
#	frontend/src/pages/index/+Page.vue

2024-04-23 16:56:48 +02:00

..

i18n.ts

Imported boilerplate_frontend as a subtree under frontend/.

2024-01-28 12:49:49 +01:00

pinia.ts

Imported boilerplate_frontend as a subtree under frontend/.

2024-01-28 12:49:49 +01:00

vuetify.ts

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 7114-implement-ocelot-color-tokens-in-frontend-with-theme

2024-04-23 16:56:48 +02:00