Skip to content

Commit

Permalink
Merge branch 'master' into django-req
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamu committed Jan 20, 2018
2 parents 45d7392 + 9ea136e commit 7652786
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
![](http://pinaxproject.com/pinax-design/patches/pinax-badges.svg)

# Pinax Badges

[![](https://img.shields.io/pypi/v/pinax-badges.svg)](https://pypi.python.org/pypi/pinax-badges/)
Expand All @@ -11,6 +13,7 @@
[![](http://slack.pinaxproject.com/badge.svg)](http://slack.pinaxproject.com/)
[![](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)


## Table of Contents

* [About Pinax](#about-pinax)
Expand All @@ -30,6 +33,7 @@
* [Connect with Pinax](#connect-with-pinax)
* [License](#license)


## About Pinax

Pinax is an open-source platform built on the Django Web Framework. It is an ecosystem of reusable
Expand Down Expand Up @@ -83,7 +87,7 @@ Add `pinax.badges.urls` to your project urlpatterns:
url(r"^badges/", include("pinax.badges.urls", namespace="pinax_badges")),
]
```


### Usage

Expand Down Expand Up @@ -180,6 +184,7 @@ By default badges will be awarded at the current time, if you need to overide
the award time of the badge you can pass a `force_timestamp` keyword argument
to `possibly_award_badge()`.


### Asynchronous Badges

**Important**
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

VERSION = "2.0.0"
LONG_DESCRIPTION = """
.. image:: http://pinaxproject.com/pinax-design/patches/pinax-app.svg
.. image:: http://pinaxproject.com/pinax-design/patches/pinax-badges.svg
:target: https://pypi.python.org/pypi/pinax-badges/
============
Expand Down Expand Up @@ -86,4 +86,4 @@
],
test_suite="runtests.runtests",
zip_safe=False
)
)

0 comments on commit 7652786

Please sign in to comment.