8000 Merge branch 'QA_2_3' · codezninja/codebird-php@9933cdb · GitHub
[go: up one dir, main page]
Skip to content

Commit 9933cdb

Browse files
mynetxmynetx
committed
Merge branch 'QA_2_3'
Conflicts: CHANGELOG
2 parents 7f352ba + 6a32668 commit 9933cdb

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

‎CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ codebird-php - changelog
44
2.4.0 (not yet released)
55
+ rfe #21 JSON return format
66

7+
2.3.7 (not yet released)
8+
+ Add contributing guidelines
9+
710
2.3.6 (2013-05-12)
811
+ Add backslash to stdClass construction, due to namespace
912

‎CONTRIBUTING.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
### Which branch?
2+
- Bugs are fixed in the latest QA_* branch, please base your bugfix pull requests on this branch.
3+
- New features are added to the master branch, please base your feature-add pull requests on that branch.
4+
5+
### Code style
6+
- Please use 4 soft spaces per indent level.
7+
- Take a look at the coding style used in codebird.php and apply the same convention to your contributed code.
8+
The styleguide is also available online at http://pear.php.net/manual/en/standards.php.
9+
10+
### License
11+
- Code contributed by you will get the same license as Codebird itself, that is, GPU General Public License V3.

0 commit comments

Comments
 (0)
0