Commit e2500b05 authored by Afid's avatar Afid

Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

# Conflicts:
#	App.js
parents be7c32db cb8ad49b
...@@ -16,6 +16,7 @@ import { Text, View } from 'react-native'; ...@@ -16,6 +16,7 @@ import { Text, View } from 'react-native';
import { AppLoading } from 'expo'; import { AppLoading } from 'expo';
import * as Font from 'expo-font'; import * as Font from 'expo-font';
export const lang = i18n.translations = { export const lang = i18n.translations = {
en: en, en: en,
id: id id: id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment