| Conflicts: app/assets/javascripts/desktop/orbitdesktop.js | ||
|---|---|---|
| .. | ||
| .gitkeep | ||
| conference_author_type.rb | ||
| conference_co_author.rb | ||
| conference_co_author_relation.rb | ||
| conference_paper_type.rb | ||
| writing_conference.rb | ||
| writing_conference_category.rb | ||
| writing_conference_file.rb | ||