d2a07d9ffb
Conflicts: app/models/user/user.rb |
||
---|---|---|
.. | ||
get_journal_paper_data.html.erb | ||
get_teacher_data.html.erb |
d2a07d9ffb
Conflicts: app/models/user/user.rb |
||
---|---|---|
.. | ||
get_journal_paper_data.html.erb | ||
get_teacher_data.html.erb |