This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740. Conflicts: app/models/conference.rb |
||
|---|---|---|
| .. | ||
| admin | ||
| application | ||
| commercials | ||
| conference | ||
| conference_registrations | ||
| devise | ||
| layouts | ||
| proposal | ||
| schedule | ||
| shared | ||
| tickets | ||
| users | ||
This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740. Conflicts: app/models/conference.rb |
||
|---|---|---|
| .. | ||
| admin | ||
| application | ||
| commercials | ||
| conference | ||
| conference_registrations | ||
| devise | ||
| layouts | ||
| proposal | ||
| schedule | ||
| shared | ||
| tickets | ||
| users | ||