This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch mod-gui
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 4659f2061fb4f51016d0a0dc5abb9c07dd075864
Merge: dbf0772 9139150
Author: Sebb <[email protected]>
AuthorDate: Thu Jan 17 14:35:47 2019 +0000

    Merge branch 'master' into mod-gui

 tools/tocsplit.rb                                       | 11 ++++++++++-
 www/roster/models/committee.rb                          |  4 ++--
 www/roster/views/app.js.rb                              |  4 ++--
 www/roster/views/nonpmc/{nonpmc.js.rb => members.js.rb} |  0
 www/roster/views/pmc/{pmc.js.rb => members.js.rb}       |  2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

Reply via email to