diff options
| author | Thibaut Horel <thibaut.horel@gmail.com> | 2010-09-25 01:09:48 +0200 |
|---|---|---|
| committer | Thibaut Horel <thibaut.horel@gmail.com> | 2010-09-25 01:09:48 +0200 |
| commit | b8f4d3a0ab100f1b758be9de719a2f586adba7bb (patch) | |
| tree | 1f5302ce47e1bb2167985a4cf92b0f702c348e76 /.gitignore | |
| parent | a2c618a4cb39b509aa03b1ff7fc7915b0d6d6c9a (diff) | |
| parent | 724c296e54714a949ce79c5056229e00fb7c15c2 (diff) | |
| download | alias-b8f4d3a0ab100f1b758be9de719a2f586adba7bb.tar.gz | |
Merge horel.fr.nf:alias
Conflicts:
.gitignore
__init__.py
object.py
permission.py
users/thibaut/4786341468f1bb861b8ae2cd6dc0a2c582bf5da5
users/thibaut/71f57e14acfdc04b2fe6ed5e2b4dc4e04558dea9
users/thibaut/db.sql
users/thibaut/ed10ca5a70af5dfbd943667ec2b9ee857ee2a148
version.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1 +1,2 @@ *.pyc +.directory |