Skip to content

Commit

Permalink
Merge branch 'master' into rel-ww2.14
Browse files Browse the repository at this point in the history
  • Loading branch information
mgage authored Dec 30, 2018
2 parents 7554c38 + 2ebce59 commit 1a067f7
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
Online Homework Delivery System
Version 2.*


Copyright 2000-2018, The WeBWorK Project
Copyright 2000-2019, The WeBWorK Project

All rights reserved.

Expand All @@ -22,11 +21,11 @@
the GNU General Public License or the Artistic License for more details.

You should have received a copy of the Artistic License with this
package, in the file named "Artistic". If not, we'll be glad to provide
package, in the file named "Artistic" inside the `doc` folder. If not, we'll be glad to provide
one.

You should also have received a copy of the GNU General Public License
along with this program in the file named "Copying". If not, write to the
along with this program in the file named "Copying" inside the `doc` folder. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307, USA or visit their web page on the internet at
http://www.gnu.org/copyleft/gpl.html.

0 comments on commit 1a067f7

Please sign in to comment.