Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into revert-18-master
Conflicts:
	assets/css/main.css
  • Loading branch information
nateperry committed Oct 11, 2014
commit daf5fb974f20c014f4a6bd6e6ec00a246b03b177
2 changes: 1 addition & 1 deletion assets/css/main.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

You are viewing a condensed version of this merge commit. You can view the full changes here.