Thomas Reynolds ddc0712c1b Say :update, not :create on automatic conflict resolution		2012-06-19 19:40:57 -07:00
..
bin	Attempt address #466 and avoid Bundler issues with RVM	2012-06-13 20:33:50 -07:00
features	travishatesme	2012-06-18 16:53:22 -07:00
fixtures	Move encoding tests into a dynamic form so they aren't packaged with gemspecs on unsupported platforms.	2012-06-18 15:18:16 -07:00
lib	Say :update, not :create on automatic conflict resolution	2012-06-19 19:40:57 -07:00
.gemtest	enable gemtest at a per-gem level	2012-01-02 14:48:47 -08:00
middleman-core.gemspec	bump deps	2012-06-13 23:19:28 -07:00
Rakefile	switch to guard/listen	2012-02-25 15:53:23 -08:00