Subida de V
Això és una prova
Merge branch 'gallery' of https://github.com/lacetans/pyges into gallery
Prova
Conflicts:
	README
mod __init__ and views
Creat upload.mako y modificat models.py
Merge branch 'gallery' of https://github.com/lacetans/pyges into gallery
creem upload.mako y modifiquem models.py
Esborrar
Please enter the commit message for your changes.  Lines starting
correcció errors
ja puja imatges!!!!
proves display
subida 20:18 to delete!
Merge branch 'gallery' of https://github.com/lacetans/pyges into gallery

Conflicts:
	src/pyges/pyges/__init__.py
	src/pyges/pyges/views.py
Conflicto
Prueba img
Merge branch 'gallery' of https://github.com/lacetans/pyges into gallery

Conflicts:
	src/pyges/pyges/views.py
q
proves
ghjgh
treure