You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by br...@apache.org on 2015/04/21 16:54:19 UTC

[2/2] incubator-ripple git commit: Merge branch 'timwindows_master'

Merge branch 'timwindows_master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/f59e16eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/f59e16eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/f59e16eb

Branch: refs/heads/master
Commit: f59e16ebde5c4ccf4cddc20c7049c235329bde3d
Parents: 6efb1f3 7fa632d
Author: Brent Lintner <br...@gmail.com>
Authored: Tue Apr 21 10:53:04 2015 -0400
Committer: Brent Lintner <br...@gmail.com>
Committed: Tue Apr 21 10:53:04 2015 -0400

----------------------------------------------------------------------
 assets/client/index.html                       | 2 +-
 assets/server/index.html                       | 6 +-----
 targets/chrome.extension/controllers/update.js | 4 ++--
 targets/chrome.extension/views/popup.html      | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------