aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2013-04-07 01:12:39 -0400
committerTeddy Wing2013-04-07 01:12:39 -0400
commitfb02d6d196425ab9e5d600b148996e880fe28963 (patch)
tree58ea94652bae793f67439da7c044a15ae7fccec8
parent0d17c4761ff44c86c0378189d56f0be2a3ec8484 (diff)
downloadclips-fb02d6d196425ab9e5d600b148996e880fe28963.tar.bz2
Add LICENSE
-rw-r--r--LICENSE7
-rw-r--r--README.md6
2 files changed, 12 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..9bff61a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,7 @@
+Copyright (c) 2013 Teddy Wing
+
+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 the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
diff --git a/README.md b/README.md
index 1a1179c..60b91ce 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ An Instapaper-ish web application that allows you to collect URLs to check later
# Running the application
-Clips is written in [Campfire](http://campfire.io). Start by `bundle install`ing gems. Then start the server.
+Clips is written in [Campfire](http://campfire.io). Start by `bundle install`-ing gems. Then start the server.
$ bundle install
$ rackup
@@ -13,3 +13,7 @@ Clips is written in [Campfire](http://campfire.io). Start by `bundle install`ing
Use [Rerun](https://github.com/rerun/rerun) to auto-restart the server when the filesystem changes:
$ rerun -- rackup
+
+
+# License
+Clips is licensed under the MIT License. See the included LICENSE file.