Merge remote-tracking branch 'origin/feature/1.6.4' into feature/1.7
Conflicts: abvw/common/js/common.js abvw/js/contentview.js abvw/js/contentview_CallApi.js abvw/js/contentview_Events.js abvw/js/contentview_GetData.js abvw/js/home.js abvw/js/share.js
Showing
abvw/css/accordion.css
deleted
100644 → 0
abvw/css/backup.css
deleted
100644 → 0
abvw/css/contentsearch.css
deleted
100644 → 0
abvw/css/header.css
deleted
100644 → 0
abvw/css/history.css
deleted
100644 → 0
abvw/css/limit_access.css
deleted
100644 → 0
abvw/css/list_shiori.css
deleted
100644 → 0
abvw/css/list_shirori_detail.css
deleted
100644 → 0
abvw/css/login.css
deleted
100644 → 0
abvw/css/login_validation.css
deleted
100644 → 0
abvw/css/logout.css
deleted
100644 → 0
abvw/css/restore.css
deleted
100644 → 0
abvw/css/setting.css
deleted
100644 → 0
abvw/css/theme/Anket.css
deleted
100644 → 0
abvw/css/theme/accordion.css
deleted
100644 → 0
abvw/css/theme/backup.css
deleted
100644 → 0
abvw/css/theme/bookshelf.css
deleted
100644 → 0
abvw/css/theme/common.css
deleted
100644 → 0
abvw/css/theme/contentsearch.css
deleted
100644 → 0
abvw/css/theme/delete_shiori.css
deleted
100644 → 0
abvw/css/theme/footer.css
deleted
100644 → 0
abvw/css/theme/header.css
deleted
100644 → 0
abvw/css/theme/history.css
deleted
100644 → 0
abvw/css/theme/home.css
deleted
100644 → 0
abvw/css/theme/limit_access.css
deleted
100644 → 0
abvw/css/theme/list.css
deleted
100644 → 0
abvw/css/theme/list_shiori.css
deleted
100644 → 0
abvw/css/theme/login.css
deleted
100644 → 0
abvw/css/theme/login_validation.css
deleted
100644 → 0
abvw/css/theme/restore.css
deleted
100644 → 0
abvw/css/theme/setting.css
deleted
100644 → 0
abvw/css/theme/share.css
deleted
100644 → 0
abvw/css/theme/tab.css
deleted
100644 → 0
abvw/css/theme/viewer.css
deleted
100644 → 0
Please
register
or
sign in
to comment