diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2015-07-13 11:33:42 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2015-07-13 11:33:42 -0300 |
commit | 65c88cf4770dff781249f6d5b470c01a9a0c6d04 (patch) | |
tree | c21fefcecc5e6a3858eb9155753b2ada42939daa /Makefile | |
parent | 745cd614e263f6c94fa628e86fc3f330faf6ae6a (diff) | |
parent | 5e0d09354cfc1f66390719dc29dca5ddba08224a (diff) | |
download | blog-65c88cf4770dff781249f6d5b470c01a9a0c6d04.tar.gz blog-65c88cf4770dff781249f6d5b470c01a9a0c6d04.tar.bz2 |
Merge branch 'master' into develop
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -14,8 +14,8 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # -wiki: +web: @ikiwiki --setup ikiwiki.setup -wiki_deploy: +web_deploy: @rsync -avz --delete www/ blog:/var/sites/rhatto/www/ |