diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2014-05-26 15:21:54 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2014-05-26 15:21:54 +0200 |
commit | 88fda31e98c367acb46ececfffb5105763506d88 (patch) | |
tree | 0c63372a171b2da2a1223ff609e691735d4fdd31 /ishtar_common/widgets.py | |
parent | cd39cd6a351c9e25b65938e95cb5129ca463a9a2 (diff) | |
parent | 7b43d9761a89ba469334ce36f3260e40378faaeb (diff) | |
download | Ishtar-88fda31e98c367acb46ececfffb5105763506d88.tar.bz2 Ishtar-88fda31e98c367acb46ececfffb5105763506d88.zip |
Merge branch 'newstyle'
Conflicts:
ishtar_common/static/media/style.css
Diffstat (limited to 'ishtar_common/widgets.py')
0 files changed, 0 insertions, 0 deletions