Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
f1nality committed Aug 30, 2016
2 parents 29e1bcf + e26e7f6 commit fea0704
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -8,7 +8,7 @@ Django JET
**Modern template for Django admin interface with improved functionality**

Django JET has two kinds of licenses: open-source (AGPLv3) and commercial. Please note that using AGPLv3
code in your programs make them AGPL too. So if you don't want to comply with that we can provide you a commercial
code in your programs make them AGPL compatible too. So if you don't want to comply with that we can provide you a commercial
license (visit Home page). The commercial license is designed for using Django JET in commercial products
and applications without the provisions of the AGPLv3.

Expand Down
6 changes: 3 additions & 3 deletions docs/index.rst
Expand Up @@ -29,9 +29,9 @@ License
=======

Django JET has two kinds of licenses: open-source (AGPLv3) and commercial. Please note that using AGPLv3
code in your programs make them GPL too. So if you don't want to comply with that we can provide you a commercial
license (visit Home page). The commercial license is designed for using Django JET in commercial products and
applications without the provisions of the AGPLv3.
code in your programs make them AGPL compatible too. So if you don't want to comply with that we can provide you
a commercial license (visit Home page). The commercial license is designed for using Django JET in commercial products
and applications without the provisions of the AGPLv3.

Resources
=========
Expand Down

0 comments on commit fea0704

Please sign in to comment.