diff options
| author | Primal Pappachan | 2012-04-02 18:46:13 +0530 |
|---|---|---|
| committer | Primal Pappachan | 2012-04-02 18:46:13 +0530 |
| commit | 733efc93b641d76e129277ad75c679bd2560ae65 (patch) | |
| tree | 6b855bb07ebd3adce4c6e4526d7cd10b2117b0c4 /.gitignore | |
| parent | 13159a05ddc973051174456407c7b0c384cb70ce (diff) | |
| parent | d00d3b38e12cd044a22898dbd6d18002d182a49a (diff) | |
| download | aloha-733efc93b641d76e129277ad75c679bd2560ae65.tar.gz aloha-733efc93b641d76e129277ad75c679bd2560ae65.tar.bz2 aloha-733efc93b641d76e129277ad75c679bd2560ae65.zip | |
Merge github.com:FOSSEE/aloha
Conflicts:
aloha/allotter/views.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions