OSDN Git Service

Merge remote-tracking branch 'jarednova/fix_psr_0'
authorJefersson Nathan <admin@phpse.net>
Mon, 15 Jun 2015 10:45:46 +0000 (07:45 -0300)
committerJefersson Nathan <admin@phpse.net>
Mon, 15 Jun 2015 10:45:46 +0000 (07:45 -0300)
commitfd3b776d71f4d3427c442e8a69d17e19d0a7af76
tree441bd1d2a46519d3ede8bfe66a6bd49f2fc17ad3
parentd55613a001d146b13a894cb0d6f1f7b7a02e12b3
parentb35aac9fbf91eb23eadfa4f5e65eb9751977d093
Merge remote-tracking branch 'jarednova/fix_psr_0'

Conflicts:
composer.json