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

Merge develop into master. #25

Merged
merged 40 commits into from
Dec 15, 2017
Merged

Merge develop into master. #25

merged 40 commits into from
Dec 15, 2017

Conversation

froboy
Copy link
Contributor

@froboy froboy commented Dec 15, 2017

No description provided.

aCyborg and others added 30 commits October 8, 2017 15:41
# Conflicts:
#	src/content/assets/css/styles.css
always centered 16:9 sponsor logos
fixed a minor typo
removed a stray character (Í) after the close header tag
Move svg assets to the assets directory.
Revert "Move svg assets to the assets directory."
@froboy froboy merged commit de2b4c4 into master Dec 15, 2017
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.

3 participants