12112014
merged
Merging Paginas do Paulo com Paginas do Mauri (login e sign up)
bad versiongit add -A several issues
removing conflitct from xml file
removing conflitct from xml file again
moderador - gerenciamento de versoes pendentes
resolved issue with glassfish
melhorias no approval-confirmation
commit pos execution
versão final 1 do gerenciamento de pententes
versão final 1 do gerenciamento de pententes
login_funcionando
commiting before merging ramo do arthur, signup working fine
merging from arthur
baixei a versao errada do arthur, resolvi a aprovacao do projeto
merging from arthur
merged successfully with Arthur's branch, approving and rejecting projects
merged from mauri, with login
tested login, logout, aprrove, reprove projet -- all working fine