Wolfgang Huß 850f3c15ac Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu ...

# Conflicts:
#	webapp/components/DonationInfo/DonationInfo.spec.js
#	webapp/components/DonationInfo/DonationInfo.vue
#	webapp/pages/index.vue

2021-09-16 11:30:05 +02:00

..

html

Add empty line at end of all 'webapp/locales/html/*/organization.html'

2021-08-09 14:10:32 +02:00

de.json

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu

2021-09-16 11:30:05 +02:00

en.json

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu

2021-09-16 11:30:05 +02:00

es.json

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu

2021-06-14 15:16:00 +02:00

fr.json

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu

2021-06-14 15:16:00 +02:00

index.js

added Russian to locales

2019-11-02 16:18:18 +01:00

it.json

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu

2021-06-14 15:16:00 +02:00

nl.json

Implement flexible page footer links

2021-06-02 20:18:11 +02:00

pl.json

Implement flexible page footer links

2021-06-02 20:18:11 +02:00

pt.json

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu

2021-06-14 15:16:00 +02:00

ru.json

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu

2021-07-21 11:22:34 +02:00