Alberto Garcia Cabeza 910b24936d Merge branch 'master' into voting-proposals ...

Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb

2016-09-15 13:58:53 +02:00

..

matchers

adds specs

2015-11-23 13:43:48 +01:00

phantomjs_ext

fixes flacky test: "$ is undefined"

2016-04-13 14:13:45 +02:00

common_actions.rb

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

verifiable.rb

moves verification group specs

2016-02-17 13:24:16 +01:00