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 | |
| 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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | users/thibaut/4786341468f1bb861b8ae2cd6dc0a2c582bf5da5 | 1 | ||||
| -rw-r--r-- | users/thibaut/71f57e14acfdc04b2fe6ed5e2b4dc4e04558dea9 | 1 | ||||
| -rw-r--r-- | users/thibaut/db.sql | bin | 2048 -> 0 bytes | |||
| -rw-r--r-- | users/thibaut/ed10ca5a70af5dfbd943667ec2b9ee857ee2a148 | 1 |
6 files changed, 3 insertions, 3 deletions
@@ -1 +1,2 @@ *.pyc +.directory @@ -0,0 +1,2 @@ +* Thibaut -- project manager +* Guillaume diff --git a/users/thibaut/4786341468f1bb861b8ae2cd6dc0a2c582bf5da5 b/users/thibaut/4786341468f1bb861b8ae2cd6dc0a2c582bf5da5 deleted file mode 100644 index 89df1e2..0000000 --- a/users/thibaut/4786341468f1bb861b8ae2cd6dc0a2c582bf5da5 +++ /dev/null @@ -1 +0,0 @@ -fils diff --git a/users/thibaut/71f57e14acfdc04b2fe6ed5e2b4dc4e04558dea9 b/users/thibaut/71f57e14acfdc04b2fe6ed5e2b4dc4e04558dea9 deleted file mode 100644 index ea7b6a8..0000000 --- a/users/thibaut/71f57e14acfdc04b2fe6ed5e2b4dc4e04558dea9 +++ /dev/null @@ -1 +0,0 @@ -pere diff --git a/users/thibaut/db.sql b/users/thibaut/db.sql Binary files differdeleted file mode 100644 index cca9035..0000000 --- a/users/thibaut/db.sql +++ /dev/null diff --git a/users/thibaut/ed10ca5a70af5dfbd943667ec2b9ee857ee2a148 b/users/thibaut/ed10ca5a70af5dfbd943667ec2b9ee857ee2a148 deleted file mode 100644 index 4fe92a6..0000000 --- a/users/thibaut/ed10ca5a70af5dfbd943667ec2b9ee857ee2a148 +++ /dev/null @@ -1 +0,0 @@ -fils2 |