Download as
Browse Code »

Commit 56e23c61c218a1aa0b54a20cb3b20e39c702425f

Authored by Victor Costa
2 parents 41640788 f7853bc0
Exists in staging

Merge branch 'staging' of softwarepublico.gov.br:noosfero-themes/angular-theme into staging 

Conflicts:
	dist/angular-default/index.html
	dist/angular-default/index.html.erb
	dist/angular-default/scripts/app-df903ca336.js
	dist/participa-consulta/index.html
	dist/participa-consulta/index.html.erb
	dist/participa-consulta/scripts/app-aea7e3d0c9.js
Showing 0 changed files   Show diff stats