Merged master / fixed merge conflict

This commit is contained in:
MrCasual
2015-08-16 22:38:58 -04:00
8 changed files with 170 additions and 8 deletions

View File

@ -48,15 +48,15 @@ class RoboFile extends \Robo\Tasks {
function makepot() {
$this->_exec('grunt makepot'.
' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
' --base_path '.__DIR__
' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
' --base_path '.__DIR__
);
}
function pushpot() {
$this->_exec('grunt pushpot'.
' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
' --base_path '.__DIR__
' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
' --base_path '.__DIR__
);
}