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

Final Sprint #96

Merged
merged 69 commits into from
May 2, 2018
Merged

Final Sprint #96

merged 69 commits into from
May 2, 2018

Conversation

aszecsei
Copy link
Owner

@aszecsei aszecsei commented May 2, 2018

No description provided.

TannerBrunscheon and others added 30 commits April 11, 2018 22:57
# Conflicts:
#	app/renderer/components/messageentry.tsx
…/prettifing

# Conflicts:
#	app/renderer/components/messageentry.tsx
Async it and message entry styling
YOUTUBE PREVIEW!!!!(and emoticon refactor)
@aszecsei aszecsei merged commit eb2363e into master May 2, 2018
@coveralls
Copy link

Coverage Status

Coverage decreased (-6.0%) to 73.754% when pulling 362e7e9 on develop into 27d8273 on master.

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.

None yet

4 participants