deac/middleman-deploy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'features/environments_readme' of github.com:derek-watson/middleman-deploy into features/environments_readme

Browse source 
Conflicts:
	README.md
This commit is contained in:
Derek Watson 2014-02-22 23:19:34 -05:00
commit 4e46a4e3e7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -111,7 +111,11 @@ end
### Multiple Environments ### Multiple Environments
<<<<<<< HEAD
Deploy your site to more than one configuration using environment variables. Deploy your site to more than one configuration using environment variables.
=======
Deploy to different environments using environment variables and Rake tasks.
>>>>>>> 260665eef9aa105ebd6521f300cbdc059e063a82
```ruby ```ruby
# config.rb # config.rb