cxt
e3150716f3
Conflicts: app/views/layouts/_footer.html.erb app/views/layouts/base_contest_community.html.erb app/views/layouts/base_contests.html.erb app/views/layouts/base_course_community.html.erb app/views/layouts/base_courses.html.erb app/views/layouts/base_project_community.html.erb app/views/layouts/new_base.html.erb app/views/layouts/new_base_user.html.erb db/schema.rb public/stylesheets/css/structure.css public/stylesheets/font/FontAwesome.otf public/stylesheets/font/fontawesome-webfont.eot public/stylesheets/font/fontawesome-webfont.svg public/stylesheets/font/fontawesome-webfont.ttf public/stylesheets/font/fontawesome-webfont.woff public/stylesheets/font2/FontAwesome.otf public/stylesheets/font2/fontawesome-webfont.eot public/stylesheets/font2/fontawesome-webfont.svg public/stylesheets/font2/fontawesome-webfont.ttf public/stylesheets/font2/fontawesome-webfont.woff public/stylesheets/fonts/FontAwesome.otf public/stylesheets/fonts/fontawesome-webfont.eot public/stylesheets/fonts/fontawesome-webfont.svg public/stylesheets/fonts/fontawesome-webfont.ttf public/stylesheets/fonts/fontawesome-webfont.woff |
||
|---|---|---|
| .. | ||
| assets | ||
| help | ||
| images | ||
| javascripts | ||
| plugin_assets | ||
| statistics/trustie2 | ||
| stylesheets | ||
| themes | ||
| 404.html | ||
| 500.html | ||
| Trustie_Beta1.0.0_201412310917.apk | ||
| app.html | ||
| dispatch.fcgi.example | ||
| favicon.ico | ||
| favicon.old.ico | ||
| file_not_found.html | ||
| file_not_found.html.erb | ||
| htaccess.fcgi.example | ||
| no_file_found.html | ||