Merge branch 'dev' into github-code-theme

Browse Source

Conflicts:
	Rakefile

...

This commit is contained in:

Jon Rohan

2013-02-01 14:28:23 -05:00

parent 2788ee2715 eb349eca69

commit b9b3daba77

11 changed files with 253 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

.atom/packages/Readme.md