Merge remote-tracking branch 'upstream/develop' into develop
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/fba2720f Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/fba2720f Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/fba2720f Branch: refs/heads/develop Commit: fba2720f89413ff9e7ff113eee9d275a9e71c58c Parents: 516b13a 2f9088d Author: Sneha Tilak <[email protected]> Authored: Fri Jun 30 12:02:30 2017 -0400 Committer: Sneha Tilak <[email protected]> Committed: Fri Jun 30 12:02:30 2017 -0400 ---------------------------------------------------------------------- app/libraries/CommonUtilities.php | 7 ++++++- public/js/time-conversion.js | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
