Merge branch 'maint'

Sync with latest maint branch bugfixes.

- Fix/Update LibreJS @source URL to cgit tree
- Change package.json bugs contact to bugs@pantsu.cat email, remove URL
- package.json: Use lowercase pomf for package name
- Gruntfile: Sort grunt-swig options alphabetically

Conflicts:
	Gruntfile.js

2 files changed, 7 insertions, 7 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index 2455ff7..488e5b7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,11 +7,13 @@ module.exports = function (grunt) {
           allowErrors: false
         },
         banners: grunt.file.readJSON('pages/banners.json'),
-        max_upload_size: 128,
         dest: 'dist',
-        generateSitemap: false,
         generateRobotstxt: false,
+        generateSitemap: false,
+        max_upload_size: 128,
         pkgVersion: '<%= pkg.version %>',
+        production: false,
+        siteUrl: 'https://pantsu.cat/',
         src: [
           'pages/index.swig',
           'pages/faq.swig',
@@ -19,14 +21,12 @@ module.exports = function (grunt) {
           'pages/other.swig',
           'pages/nojs.swig'
         ],
-        siteUrl: 'https://pantsu.cat/',
-        production: false,
       }
     },
     uglify: {
       options: {
         banner: '/*! <%= pkg.name %> (<%= pkg.repository.url %>) @ <%= grunt.template.today("yyyy-mm-dd") %> */\n' + 
-          '// @source https://git.pantsu.cat/pantsu/pomf/src/master/js\n' + 
+          '// @source https://git.pantsu.cat/pantsu/pomf/tree/js\n' + 
           '// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat\n',
         footer: '\n// @license-end',
         screwIE8: true
diff --git a/package.json b/package.json
index 5ac101a..3fe0a11 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "Pomf",
+  "name": "pomf",
   "version": "2.0.1",
   "description": "Kawaii file host",
   "homepage": "https://pantsu.cat/",
@@ -17,7 +17,7 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://git.pantsu.cat/pantsu/pomf/issues"
+    "email": "bugs@pantsu.cat"
   },
   "devDependencies": {
     "grunt": "^0.4.1",