]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 22:08:33 +0000 (23:08 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 22:08:33 +0000 (23:08 +0100)
commit6e8f97d6596467e2ebd3ca18ba6e57c675bb4d97
tree12960b485cc6d8e649e3bd91ef660e7520d9cc81
parenta636ec4ca79673a42e4e6292834d0015226b8158
parentb6559e1aec4c1aa6bf0ddf16cf020c6d5abcc8e9
Merge branch 'dev' into crem2

Conflicts:
example/sandbox/settings.py
setup.py
telemeta/views/collection.py
telemeta/views/core.py
telemeta/views/item.py
example/sandbox/settings.py
telemeta/templates/telemeta/base.html
telemeta/urls.py
telemeta/views/collection.py
telemeta/views/core.py
telemeta/views/item.py