Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/server/web/app/mobile/views/pages/settings.vue
View file

@ -12,19 +12,20 @@
<ul>
<li><a @click="signout">%fa:power-off%%i18n:mobile.tags.mk-settings-page.signout%</a></li>
</ul>
<p><small>ver {{ v }} (葵 aoi)</small></p>
<p><small>ver {{ version }} ({{ codename }})</small></p>
</div>
</mk-ui>
</template>
<script lang="ts">
import Vue from 'vue';
import { version } from '../../../config';
import { version, codename } from '../../../config';
export default Vue.extend({
data() {
return {
v: version
version,
codename
};
},
mounted() {