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:43 UTC

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

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(-)