Merge branch 'master' into getStringNow

Conflicts:
	build/bundle.min.js
	index.html
	todo.txt

Conflicts:
	build/bundle.min.js
	index.html
	todo.txt
This commit is contained in:
Peter Cottle 2013-07-21 18:43:20 -07:00
commit 219c36054f
3 changed files with 4 additions and 1 deletions

File diff suppressed because one or more lines are too long

View file

@ -6,6 +6,8 @@ Before everything else:
~~~~~~~~~~~~~~~~~~~~~~~~~~
[ ] increase test coverage over everything
- unit and integration, but mostly for git operations
[ ] green refactor tree compare to have map
[ ] figure out gh-pages force
Intl TODO
~~~~~~~~~~~~~~~~~~~