summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpantsucat <contact@pantsu.cat>2015-09-20 04:11:35 +0200
committerpantsucat <contact@pantsu.cat>2015-09-20 04:11:35 +0200
commitb484dd87e619b407ea91a21b5d5ff229adbd3f76 (patch)
tree89a0d982a6296e1d9fe1324b891422bf839d7786
parentc272f64a5e3b76b1ade611c1cbae8ced0f6244e8 (diff)
parentd4306b9a23477a51c213c52e63e5aac61976e783 (diff)
Merge branch 'license' into development
-rw-r--r--LICENSE4
-rw-r--r--README.md2
2 files changed, 4 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 1a2fe26..a1f9a1f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,8 @@
The MIT License (MIT)
-Copyright (c) 2013 nokonoko
+Copyright (c) 2013, 2014, 2015 Eric Johansson
+Copyright (c) 2013, 2014 Peter Lejeck
+Copyright (c) 2015 the Pantsu.cat developers
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
index 599149e..efedfaf 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ following shell code:
```
npm install -g grunt-cli
-git clone https://git.pantsu.cat/pantsucat/pomf.git
+git clone https://git.pantsu.cat/pantsu/pomf.git
cd pomf/
npm install
grunt