dmpopidor / app /
@briley briley authored on 29 Jun 2016
..
admin renamed config/environment to config/environments which is what rails is looking for. Commented out the DOCX mime type reference because it is already added by rails. Commented out the belongs_to_and has_many line in models/user because it is already defined by rolify gem 9 years ago
assets Rebased development branch and corrected merge conflicts 9 years ago
controllers Master (#7) 9 years ago
helpers DMPonline4 - RAILS 4.0 (#4) 9 years ago
mailers DMPonline4 - RAILS 4.0 (#4) 9 years ago
models renamed config/environment to config/environments which is what rails is looking for. Commented out the DOCX mime type reference because it is already added by rails. Commented out the belongs_to_and has_many line in models/user because it is already defined by rolify gem 9 years ago
views Rebased development branch and corrected merge conflicts 9 years ago