Merge upstream/master into dev

rcos / observatory-server

A project tracking dashboard for Rensselaer Center for Open Source

https://rcos.io

MIT License

14 stars 51 forks source link

Merge upstream/master into dev #803

Closed aeksco closed 5 years ago

aeksco commented 5 years ago

Our master and dev branches diverged pretty significantly - I pulled down the latest upstream/master changes and resolved all the conflicts manually