diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
| commit | ed6344009abb31326acabe95449aaa449f66f4b4 (patch) | |
| tree | 03d65052d550b890074dde3c18857371be974f5c /extlib/jquery | |
| parent | 5c754fdaeeddb1bbeff165bbecb77e33b75b3c7d (diff) | |
| parent | b7a3798e1806eb52a244088fb600376ff25e0de9 (diff) | |
| download | mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.lz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.xz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.zip | |
Merge branch 'master' into joar-skip_transcoding
Conflicts:
mediagoblin/config_spec.ini
Diffstat (limited to 'extlib/jquery')
| -rw-r--r-- | extlib/jquery/MIT-LICENSE.txt (renamed from extlib/jquery/MIT.txt) | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extlib/jquery/MIT.txt b/extlib/jquery/MIT-LICENSE.txt index 5a2aeb47..957f26d3 100644 --- a/extlib/jquery/MIT.txt +++ b/extlib/jquery/MIT-LICENSE.txt @@ -1,4 +1,5 @@ -Copyright (c) <year> <copyright holders> +Copyright 2013 jQuery Foundation and other contributors +http://jquery.com/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the |