Wolfgang Huß 7dbc833e22 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page ...

# Conflicts:
#	webapp/pages/profile/_id/_slug.vue

2021-01-18 14:12:13 +01:00

..

html

Starting rebranding to ocelot.social

2020-11-10 12:08:44 +01:00

de.json

Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page

2021-01-18 14:12:13 +01:00

en.json

Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page

2021-01-18 14:12:13 +01:00

es.json

merging rebranding branch from /

2020-11-10 10:28:20 +01:00

fr.json

merging rebranding branch from /

2020-11-10 10:28:20 +01:00

index.js

added Russian to locales

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

it.json

further rebranding

2020-11-16 09:43:15 +01:00

nl.json

merging rebranding branch from /

2020-11-10 10:28:20 +01:00

pl.json

merging rebranding branch from /

2020-11-10 10:28:20 +01:00

pt.json

further rebranding

2020-11-16 09:43:15 +01:00

ru.json

merging rebranding branch from /

2020-11-10 10:28:20 +01:00