diff options
author | Alex Auvolat <alex.auvolat@ens.fr> | 2015-04-24 13:46:07 -0400 |
---|---|---|
committer | Alex Auvolat <alex.auvolat@ens.fr> | 2015-04-24 13:46:07 -0400 |
commit | 1b199b0fd068dcbe2502a613caff3a1c322f73e1 (patch) | |
tree | 7e2cb3a6b14d0950246655ed3a8595b81a4fb4f1 /model.py | |
parent | 8d4621c30a4926a3393733175390bea3d3c138a0 (diff) | |
parent | 7b60ef60e03d01757dc5ea8ab3b87862f50e4ea4 (diff) | |
download | taxi-1b199b0fd068dcbe2502a613caff3a1c322f73e1.tar.gz taxi-1b199b0fd068dcbe2502a613caff3a1c322f73e1.zip |
Merge branch 'master' of github.com:adbrebs/taxi
is merge is necessary,
Diffstat (limited to 'model.py')
0 files changed, 0 insertions, 0 deletions