summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorJuuso Lapinlampi <wub@partyvan.eu>2016-01-17 17:30:32 +0100
committerJuuso Lapinlampi <wub@partyvan.eu>2016-01-17 17:30:32 +0100
commitea556b08cadb5c3459f0029eefcbd8575d6173e5 (patch)
tree179300553404f10571001476a8f00965a43e3828 /package.json
parent4dbb7930b80f7af0307922544ea9b3ccab99cb2c (diff)
parent6187651a09fcd8dcdc4e3caeed6248433bbfdcbc (diff)
Merge branch 'luminarys/vanilla-js' from WubTheCaptain
Replaces js/pomf.js and its dependencies with Luminarys' new js/app.js, written in vanilla JavaScript with no dependencies required. This should improve browser backwards compatibility. Includes patches from wub@ to add Luminarys to package.json contributors and adding the proper copyright header to js/app.js. Luminarys' original code had removed an unused CSS property from css/pomf.css. I reverted this change to merge it later as a seperate fix, to be able to merge it properly to the maint branch.
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json
index 3a37fce..6d49d44 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
"Eric Johansson <neku@pomf.se>",
"Peter Lejeck <peter.lejeck@gmail.com>",
"cenci0 <alchimist94@gmail.com>",
- "Juuso Lapinlampi <wub@partyvan.eu>"
+ "Juuso Lapinlampi <wub@partyvan.eu>",
+ "Luminarys <postmaster@gensok.io>"
],
"license": "MIT",
"bugs": {