Skip to content
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

Bring vizwit/marks:master into marks:dev #7

Merged
merged 49 commits into from
Jan 23, 2016
Merged

Bring vizwit/marks:master into marks:dev #7

merged 49 commits into from
Jan 23, 2016

Conversation

marks
Copy link
Owner

@marks marks commented Jan 23, 2016

No description provided.

timwis and others added 30 commits January 17, 2016 15:15
# Conflicts:
#	src/scripts/views/table.js
marks added a commit that referenced this pull request Jan 23, 2016
Bring vizwit/marks:master into marks:dev
@marks marks merged commit e240a82 into dev Jan 23, 2016
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