This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740. Conflicts: app/models/conference.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| serializers | ||
| views | ||
This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740. Conflicts: app/models/conference.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| serializers | ||
| views | ||