e77c4e9efe
# Conflicts: # app/models/group.rb # db/schema.rb |
||
---|---|---|
.. | ||
admin/dashboard | ||
ci | ||
dashboard/projects | ||
devise/shared | ||
events/event | ||
groups | ||
help | ||
layouts | ||
notify | ||
profiles | ||
projects | ||
shared |
e77c4e9efe
# Conflicts: # app/models/group.rb # db/schema.rb |
||
---|---|---|
.. | ||
admin/dashboard | ||
ci | ||
dashboard/projects | ||
devise/shared | ||
events/event | ||
groups | ||
help | ||
layouts | ||
notify | ||
profiles | ||
projects | ||
shared |