diff options
| author | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
|---|---|---|
| committer | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
| commit | cfa5f40283668540cda45794200809640f251acd (patch) | |
| tree | cf2bd8ffbea3ed4c01b5690ffd8ae2702976b583 /new-bootstrap2/LICENSE.txt | |
| parent | 1cd742a84a81f135234be021cf4fe7b8ff2c13ff (diff) | |
| parent | a928687830876af8c919606bae47195af65bc82d (diff) | |
| download | pelican-themes-cfa5f40283668540cda45794200809640f251acd.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Keep the latex and tag-specific feeds in bootstrap3
Conflicts:
pelican-bootstrap3/templates/base.html
Diffstat (limited to 'new-bootstrap2/LICENSE.txt')
| -rw-r--r-- | new-bootstrap2/LICENSE.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/new-bootstrap2/LICENSE.txt b/new-bootstrap2/LICENSE.txt new file mode 100644 index 0000000..ab27ee7 --- /dev/null +++ b/new-bootstrap2/LICENSE.txt @@ -0,0 +1,13 @@ +Copyright 2012 Jiachen Yang <farseerfc@gmail.com> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License.
\ No newline at end of file |