Nicolas McCurdy 98edb54ca4 Merge remote-tracking branch 'upstream/master' into rubocop-fixes ...

Conflicts:
	lib/homesick.rb

2014-01-21 22:37:48 -05:00

..

homesick

Revert changes that use "\" and disable the line length cop

2014-01-20 21:03:21 -05:00

homesick.rb

Merge remote-tracking branch 'upstream/master' into rubocop-fixes

2014-01-21 22:37:48 -05:00