Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Conflicts:
app/config/app_config.ini
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit:
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/86394cb4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/86394cb4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/86394cb4
Branch: refs/heads/master
Commit: 86394cb45927ca278fa096ec69527b2b1bf8f593
Parents: cae5a4d c362b05
Author: Nipurn Doshi <[email protected]>
Authored: Thu Apr 16 17:18:43 2015 -0400
Committer: Nipurn Doshi <[email protected]>
Committed: Thu Apr 16 17:18:43 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
