You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2019/12/25 16:08:10 UTC

[roller-website] branch asf-site updated (1da7676 -> 78a7e70)

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

snoopdave pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/roller-website.git.


    from 1da7676  Roller 6 release.
     add cd6147c  Roller 6 release.
     add 94a2b75  Roller 6 release.
     new 78a7e70  Merge branch 'master' into asf-site

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 content/downloads/downloads.html                      | 2 +-
 sources/src/main/jbake/content/downloads/downloads.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


[roller-website] 01/01: Merge branch 'master' into asf-site

Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/roller-website.git

commit 78a7e708313e260981189f7913f44f6b1a28b665
Merge: 1da7676 94a2b75
Author: Dave Johnson <sn...@gmail.com>
AuthorDate: Wed Dec 25 12:08:06 2019 -0400

    Merge branch 'master' into asf-site
    
    # Conflicts:
    #	content/downloads/downloads.html

 content/downloads/downloads.html                      | 2 +-
 sources/src/main/jbake/content/downloads/downloads.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)