Sync master to changes from creating github page #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: index.html
| </script> | ||
| <script type="text/javascript"> | ||
| try { | ||
| var pageTracker = _gat._getTracker("UA-46770558-1"); |
There was a problem hiding this comment.
Created an analytics tracking number for the site. If there is another we are using for the whole project or anything, let me know and we can put that one in here instead.
|
It's been over 24 hours. Merging. |
glennbarrett
added a commit
that referenced
this pull request
Jan 2, 2014
Sync master to changes from creating github page
|
Just a note, DO NOT delete the gh-pages branch when doing pull requests. Deleting any other branches that aren't master or gh-pages is fine after a successful merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will bring master up to date with changes from gh-pages, which is the branch used to host the github page. This is related to #3