Skip to content

Commit

Permalink
Merge branch 'master' of github.com:c9s/php-fileutil
Browse files Browse the repository at this point in the history
Conflicts:
	composer.json
	phprelease.ini
  • Loading branch information
c9s committed Mar 24, 2013
2 parents a281abd + 68ff573 commit 3b8703a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -16,4 +16,4 @@
]
},
"version": "1.6.2"
}
}
2 changes: 1 addition & 1 deletion phprelease.ini
@@ -1 +1 @@
Steps = PHPUnit, BumpVersion, GitCommit, GitTag, GitPush, GitPushTags
Steps = phpize, ./configure, make, PHPUnit, BumpVersion, GitCommit, GitTag, GitPush, GitPushTags

0 comments on commit 3b8703a

Please sign in to comment.