virtualenv/web/res/patch/piston.diff
author cavaliet
Mon, 12 Nov 2012 18:56:04 +0100
changeset 938 24c8856d1ccd
parent 56 125fc6df230d
permissions -rw-r--r--
correct po/mo merge problem.

diff -r 278:c4b2d21db51a piston/models.py
@@ -118 +118 @@
    timestamp = models.IntegerField()
    is_approved = models.BooleanField(default=False)

-   user = models.ForeignKey(User, null=True, blank=True, related_name='tokens')
+   user = models.ForeignKey(User, null=True, blank=True, related_name='piston_tokens')
    consumer = models.ForeignKey(Consumer)