Commit 58b70402 authored by juliusv's avatar juliusv

Merge pull request #13 from prometheus/beorn7/license-cleanup

License cleanup
parents f6f1457a c6501584
The Prometheus project was started by Matt T. Proud (emeritus) and
Julius Volz in 2012.
Maintainers of this repository:
* Julius Volz <julius@soundcloud.com>
The following individuals have contributed code to this repository
(listed in alphabetical order):
* Brian Brazil <brian.brazil@boxever.com>
* Johannes 'fish' Ziemke <github@freigeist.org>
* Julius Volz <julius@soundcloud.com>
* Matthias Rampke <mr@soundcloud.com>
* Stuart Nelson <stuart.nelson3@soundcloud.com>
# Contributing
Prometheus uses GitHub to manage reviews of pull requests.
* If you have a trivial fix or improvement, go ahead and create a pull
request, addressing (with `@...`) one or more of the maintainers
(see [AUTHORS.md](AUTHORS.md)) in the description of the pull request.
* If you plan to do something more involved, first discuss your ideas
on our [mailing list](https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers).
This will avoid unnecessary work and surely give you and us a good deal
of inspiration.
......@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2014 Prometheus Authors
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......
Prometheus documentation: content and static site generator
Copyright 2014-2015 The Prometheus Authors
This product includes software developed at
SoundCloud Ltd. (http://soundcloud.com/).
The following components are included in this product:
Bootstrap
http://getbootstrap.com
Copyright 2011-2014 Twitter, Inc.
Licensed under the MIT License
Font Awesome
http://fontawesome.io
Copyright by @davegandy
License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment