projects
/
pithos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2c7aacf
9c26045
)
Merge branch 'master' of https://code.grnet.gr/git/pithos
author
Sofia Papagiannaki
<papagian@gmail.com>
Wed, 18 Jul 2012 12:13:07 +0000
(15:13 +0300)
committer
Sofia Papagiannaki
<papagian@gmail.com>
Wed, 18 Jul 2012 12:13:07 +0000
(15:13 +0300)
Merge with pithos-migrate
Conflicts:
snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic.ini
1
2
snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic.ini
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic.ini
Simple merge
projects / pithos / commitdiff