Commit Graph

13 Commits

Author SHA1 Message Date
Juanjo Bazán
984984473f Fix conflict 2015-07-18 21:58:43 +02:00
Juanjo Bazán
b6d2a5efd6 uses new hash syntax by default 2015-07-18 21:49:36 +02:00
rgarcia
2bd2ceaf59 makes debates/index the root url 2015-07-18 21:28:38 +02:00
rgarcia
b060ffaa17 fixing conflicts [#9] 2015-07-18 18:19:00 +02:00
rgarcia
73c3890027 fixing conflicts [#9] 2015-07-18 18:16:10 +02:00
rgarcia
e006549092 adds votes to debates [#9] 2015-07-18 18:10:19 +02:00
rgarcia
fce0068bf4 fixing conflicts [#7] 2015-07-18 17:40:38 +02:00
rgarcia
98463e4930 adds comments to debates [#7] 2015-07-18 17:38:57 +02:00
rgarcia
62d0a385ab adds first name and last name to users 2015-07-17 19:52:55 +02:00
rgarcia
75f1638cd6 fixing conflicts [#6] 2015-07-16 21:29:44 +02:00
rgarcia
f618a9f45d adds devise configuration [#6] 2015-07-16 19:47:54 +02:00
rgarcia
be342cac76 Basic CRU operations [#5] 2015-07-16 19:22:20 +02:00
rgarcia
8db3630837 initial commit 2015-07-15 13:32:13 +02:00