Skip to content

Merged changes (mostly from ucsc-data and firebase, and cleanup) b/c end of sprint 3 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 67 commits into from
Jul 25, 2018

Conversation

SeijiEmery
Copy link
Member

No description provided.

SeijiEmery and others added 30 commits July 19, 2018 17:04
# Conflicts:
#	components/graph/graph_view_assembly.jsx
…at reason, but the unicode support there is really gross)
…rse is missing a course #). If this ever gets fixed this *should* break.
…ments until comment contents started showing up in some of the data for one dept...)
SeijiEmery and others added 28 commits July 25, 2018 09:55
…at reason, but the unicode support there is really gross)
…rse is missing a course #). If this ever gets fixed this *should* break.
…ments until comment contents started showing up in some of the data for one dept...)
merging in updates from ucsc-data (end of sprint)
@SeijiEmery SeijiEmery merged commit 5d98036 into development Jul 25, 2018
@SeijiEmery SeijiEmery deleted the sprint3 branch July 25, 2018 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants