mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2026-02-05 17:36:05 +00:00
4c808e135b
cc @mattwr18 What helped me to track down the problem was to compare the local changes to master: First, make it easy to compare with master: 1. `git fetch origin` 2. `git merge origin/master` 3. Resolve conflicts Then track the error down: 1. `git checkout origin/master -- .` 2. `git reset` 3. Add more and more changes back and wait until the error shows up - `git checkout backend` - `git checkout webapp` bingo See https://github.com/Human-Connection/Human-Connection/pull/237#issuecomment-481485741
Human-Connection
Human Connection is a free and open-source social network for active citizenship.
Technology Stack
Live demo
Try out our deployed staging environment.
Logins:
| password | role | |
|---|---|---|
user@example.org |
1234 | user |
moderator@example.org |
1234 | moderator |
admin@example.org |
1234 | admin |
Documentation
Learn how to set up a local development environment in our Docs.
Translations
Contributre translations on lokalise.co.
Developer Chat
Join the open-source community on Discord.