Skip to content
This repository has been archived by the owner on Sep 20, 2019. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:codeinchaos/restful-zend-framework
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
Ahmad Nassri committed Mar 15, 2014
2 parents 1a990bd + 2207dba commit 7ae983a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,4 @@ Licensed under [the MIT license](LICENSE).
[paypal-url]: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UJ2B2BTK9VLRS&on0=project&os0=restful-zend-framework
[paypal-image]: http://img.shields.io/badge/PayPal-Donate-green.svg
[tip4commit-url]: http://tip4commit.com/projects/644
[tip4commit-image]: http://tip4commit.com/projects/644.svg
[tip4commit-image]: http://tip4commit.com/projects/644.svg

0 comments on commit 7ae983a

Please sign in to comment.