You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ad...@apache.org on 2019/06/28 09:18:42 UTC

[roller] branch master updated (fdbffc3 -> 6916df6)

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

adityasharma pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.


    from fdbffc3  Change convenience binary release to include docs in PDF instead of ODT format.
     add 596a84f  Fixed: NOTICE file does not have standard content (ROL-2138) 1. Rearranged the content as per the standard for Notice and License files 2. Removed credits from Notice file
     add 1438660  Fixed: NOTICE file does not have standard content (ROL-2138) Improved text of the ALv2 and improved the statements as per the standards. Removed copyright notice of sub dependencies of Xinha WYSIWYG editor Updated license file as per the standards
     add 192b006  Merge branch 'master' of https://github.com/apache/roller into ROL-2138
     add 917b26b  Fixed: NOTICE file does not have standard content (ROL-2138) Improved statements in License file
     add 21fca17  Added: separate Notice and License files for the binary release (ROL-2138)
     new 6916df6  Merge pull request #29 from apache/ROL-2138

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:
 LICENSE.txt                                | 157 ++++++++++++++-----
 NOTICE.txt                                 |  65 +++-----
 LICENSE.txt => binary-includes/LICENSE.txt | 237 ++++++++++++++++++++++++-----
 binary-includes/NOTICE.txt                 |  27 ++++
 4 files changed, 360 insertions(+), 126 deletions(-)
 copy LICENSE.txt => binary-includes/LICENSE.txt (62%)
 create mode 100644 binary-includes/NOTICE.txt


[roller] 01/01: Merge pull request #29 from apache/ROL-2138

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

adityasharma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 6916df6f37de657487f9b01149e62915e2b0d980
Merge: fdbffc3 21fca17
Author: Aditya Sharma <ia...@gmail.com>
AuthorDate: Fri Jun 28 14:48:38 2019 +0530

    Merge pull request #29 from apache/ROL-2138
    
    Fixed: NOTICE file does not have standard content (ROL-2138)

 LICENSE.txt                                | 157 ++++++++++++++-----
 NOTICE.txt                                 |  65 +++-----
 LICENSE.txt => binary-includes/LICENSE.txt | 237 ++++++++++++++++++++++++-----
 binary-includes/NOTICE.txt                 |  27 ++++
 4 files changed, 360 insertions(+), 126 deletions(-)