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 | d28857c8e7e8fcdfc2b0a3b6fccfee2eff35044a (patch) | |
| tree | 0c63372a171b2da2a1223ff609e691735d4fdd31 /ishtar_common/ishtar_menu.py | |
| parent | 0e811b4439255a9c9030c0c211e78694467656cf (diff) | |
| parent | 9e0053f764bc68d13664e4d47f9b020538453f7e (diff) | |
| download | Ishtar-d28857c8e7e8fcdfc2b0a3b6fccfee2eff35044a.tar.bz2 Ishtar-d28857c8e7e8fcdfc2b0a3b6fccfee2eff35044a.zip | |
Merge branch 'newstyle'
Conflicts:
ishtar_common/static/media/style.css
Diffstat (limited to 'ishtar_common/ishtar_menu.py')
0 files changed, 0 insertions, 0 deletions