diff options
| author | Matěj Cepl <mcepl@redhat.com> | 2011-03-24 01:05:40 +0100 |
|---|---|---|
| committer | Matěj Cepl <mcepl@redhat.com> | 2011-03-24 01:05:40 +0100 |
| commit | 23fb75565611af1e85455844be1d8931efe0a0a4 (patch) | |
| tree | 49b5fd13b41e4a311db3fa73717c8fe8001b396c /package.json | |
| parent | 2e5993bc9bd0d468f4e9d12dd39e0548ba9adda1 (diff) | |
| parent | 0d4cd0b6cf83e697adf35c27c3d20ae137012db3 (diff) | |
| download | bugzilla-triage-23fb75565611af1e85455844be1d8931efe0a0a4.tar.gz | |
Merge branch 'Ehsan' into bugzillatweaks
Conflicts:
lib/main.js
package.json
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/package.json b/package.json index 85de549..679e656 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,13 @@ "fullName": "bugzilla-triage-scripts", "description": "Additional buttons and other function helping in the triage on bugzilla", "author": "Matej Cepl (http://matej.ceplovi.cz)", - "license": "MIT/X11 (http://opensource.org/licenses/mit-license.php)", + "license": "MIT/X11 (http://opensource.org/licenses/mit-license.php) and MPL", "version": "0.92" + "contributors": [ + "Ehsan Akhgari (http://ehsanakhgari.org/) <ehsan@mozilla.com>", + "Johnathan Nightingale (http://johnath.com) <johnath@mozilla.com>", + "Heather Arthur (http://harthur.wordpress.com/) <harthur@mozilla.com>", + "Steve Fink (http://blog.mozilla.com/sfink/) <sfink@mozilla.com>" + ], + "url": "https://fedorahosted.org/bugzilla-triage-scripts/", } |