Commit ea8219309bec8c67b2e6c66afa9b90e9c1a2f4df

Authored by Rodrigo Souto
2 parents 7a83424b 0972e95b

Merge branch 'chat' of gitlab.com:diguliu/noosfero into chat

Conflicts:
	public/javascripts/chat.js
Showing 0 changed files   Show diff stats