Skip to content

Commit

Permalink
Combine MPL-Licensed file with GPL licensed code
Browse files Browse the repository at this point in the history
  • Loading branch information
felipeborges committed Aug 3, 2015
1 parent f4dd126 commit c512c5a
Showing 1 changed file with 20 additions and 3 deletions.
23 changes: 20 additions & 3 deletions data/aboutReaderContent.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Alternatively, the contents of this file may be used under the terms
* of the GNU General Public License Version 3, as described below:
*
* This file is free software: you may copy, redistribute and/or modify
* it under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version XX of the License, or (at your
* option) any later version.
*
* This file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*
* Changes
* - replace Firefox specific css extensions with WebKit css extensions
* - append FeedView css selectors
Expand Down

0 comments on commit c512c5a

Please sign in to comment.