0b557117ff
Conflicts: app/assets/stylesheets/basic/global.css app/views/devise/sessions/new.html.erb app/views/layouts/devise.html.erb |
||
---|---|---|
.. | ||
admin | ||
basic_infos | ||
default_widget | ||
desktop | ||
desktop_apps | ||
desktop_themes | ||
desktop_widgets | ||
devise | ||
front | ||
js | ||
kaminari | ||
layouts | ||
mobile | ||
shared |