Alberto Garcia Cabeza 2bf6603207 Merges master and fixes conflicts

2015-10-28 12:51:23 +01:00

..

comments_spec.rb

Merges master and fixes conflicts

2015-10-28 12:51:23 +01:00

debates_spec.rb

Merges master and fixes conflicts

2015-10-28 12:51:23 +01:00

proposals_spec.rb

Merges master and fixes conflicts

2015-10-28 12:51:23 +01:00

users_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00