CirclesUBI / circles-api-legacy

User and organization profile service
GNU Affero General Public License v3.0
4 stars 0 forks source link

Merging fixed master including PR #90 #92

Closed edzillion closed 5 years ago

edzillion commented 5 years ago

Merging working master branch with dev.

This PR: https://github.com/CirclesUBI/circles-api/pull/90 was merged into master, and some fixes made to get the CI to work, so I think the easiest thing is to merge master -> dev