aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-01-03 21:43:54 +0000
committerTom Christie2013-01-03 21:46:39 +0000
commit05c72a5d303490270c9d56b81964ee59fc1ab253 (patch)
treea964bf310fefbce4ef0c6091021a898817cd042a
parent610508a5bce756c7a035039dcc1d9f7aef96bbfb (diff)
downloaddjango-rest-framework-05c72a5d303490270c9d56b81964ee59fc1ab253.tar.bz2
Fix copyright notice and travis badge
-rw-r--r--README.md4
-rw-r--r--docs/index.md4
2 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index e1d85f3c..fc1053d2 100644
--- a/README.md
+++ b/README.md
@@ -235,7 +235,7 @@ This change will not affect user code, so long as it's following the recommended
# License
-Copyright (c) 2011, Tom Christie
+Copyright (c) 2011-2013, Tom Christie
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -258,7 +258,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-[build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=restframework2
+[build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master
[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
[twitter]: https://twitter.com/_tomchristie
[group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
diff --git a/docs/index.md b/docs/index.md
index 4d50e5d6..080eca6f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -138,7 +138,7 @@ Paid support is also available from [DabApps], and can include work on REST fram
## License
-Copyright (c) 2011-2012, Tom Christie
+Copyright (c) 2011-2013, Tom Christie
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -162,7 +162,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
-[travis-build-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=restframework2
+[travis-build-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master
[urlobject]: https://github.com/zacharyvoase/urlobject
[markdown]: http://pypi.python.org/pypi/Markdown/
[yaml]: http://pypi.python.org/pypi/PyYAML