diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:18:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:25:38 +0200 |
| commit | 7a005601d48f760864258e369364b3b847d4e9fd (patch) | |
| tree | fb562597c59110eb319e9cd8f484280fcf587433 /pkgs/development/python-modules/python-sql | |
| parent | 7d7a9df3605c86e17bced51afe67eecd43f99754 (diff) | |
| parent | df310048e5f4a516663bf8c5a74029b54813a7f3 (diff) | |
Merge branch 'master' to resolve conflicts
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions