whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] 02/04: Merge branch 'master' into json-editor
Date Thu, 25 May 2017 00:40:43 GMT
This is an automated email from the ASF dual-hosted git repository.

curcuru pushed a commit to branch json-editor
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 50f2abb8a48c8f06de5207db495f879e456e7e50
Merge: 9ec3c97 a70f662
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Mon May 8 10:49:37 2017 -0400

    Merge branch 'master' into json-editor

 MACOSX.md                                  |  16 ++--
 config/whimsy.conf                         |  52 +++++-----
 tools/mkconf.rb                            |  37 +++++++
 www/board/agenda/routes.rb                 |   4 +-
 www/board/agenda/views/models/events.js.rb |   2 +-
 www/brand/list.cgi                         |  31 +++---
 www/roster/main.rb                         |   1 +
 www/roster/models/orgchart.rb              |  18 +++-
 www/roster/views/duties.html.rb            |  33 ++++---
 www/site.cgi                               |  11 ++-
 www/test/apachecon.cgi                     |  57 -----------
 www/test/conferences.cgi                   | 115 +---------------------
 www/test/site-check.cgi                    | 149 +----------------------------
 www/test/trademark.cgi                     | 132 +------------------------
 14 files changed, 154 insertions(+), 504 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <commits@whimsical.apache.org>.

Mime
View raw message