Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ci skip]
- Loading branch information
Rémy Coutable
committed
Oct 17, 2011
1 parent
9ea05a6
commit d7024f8
Showing
1 changed file
with
2 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
d7024f8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, thanks! I guess it's time to have some rest now. Would you only merge the dev branch into master when we release, or also for documentation changes like this and the travis build status update?
d7024f8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For insignificant changes like these I think we can merge safely or wait for the next release, it makes no real difference I guess, and for the travis build, we should probably merge it since it's in fact made to reflect the current state of the master branch!