Merge remote-tracking branch 'origin/branch3'

CristianCandia · Apr 17, 2014 · 7883299 · 7883299
2 parents 2405571 + 22ff36c
commit 7883299
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/microblog/app/controlador/contRol.py b/microblog/app/controlador/contRol.py
@@ -7,6 +7,7 @@
         - U{Fernando Saucedo<mailto:carlifer.fernando@gmail.com>}
 """
 
+
 from app.modelo import Rol
 from app.modelo import Fase
 from app.modelo import User2