deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
middleman/middleman-templates
History
Ben Hollis 60f712e6ba Merge branch 'v3-stable' 
Conflicts:
	.travis.yml
	Gemfile
	middleman-cli/lib/middleman-cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
	middleman-core/lib/middleman-core/templates.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core.gemspec
2014-03-25 22:35:19 -07:00
..
features move to middleman-templates 2014-03-11 11:07:55 +00:00
fixtures move to middleman-templates 2014-03-11 11:07:55 +00:00
lib Merge branch 'v3-stable' 2014-03-25 22:35:19 -07:00
spec move to middleman-templates 2014-03-11 11:07:55 +00:00
.gemtest move to middleman-templates 2014-03-11 11:07:55 +00:00
.simplecov move to middleman-templates 2014-03-11 11:07:55 +00:00
.yardopts move to middleman-templates 2014-03-11 11:07:55 +00:00
middleman-templates.gemspec middleman-templates has no executable [ci skip] 2014-03-25 12:06:31 +00:00
Rakefile whitespace [ci skip] 2014-03-25 13:13:36 +00:00