Merge branch 'master' into '129-extract-text-from-stats-and-layout'
# Conflicts: # components/labels.js
No related branches found
No related tags found
Showing
- .eslintrc 1 addition, 0 deletions.eslintrc
- android/app/build.gradle 4 additions, 1 deletionandroid/app/build.gradle
- android/app/src/main/assets/fonts/Entypo.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/Entypo.ttf
- android/app/src/main/assets/fonts/EvilIcons.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/EvilIcons.ttf
- android/app/src/main/assets/fonts/Feather.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/Feather.ttf
- android/app/src/main/assets/fonts/FontAwesome.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/FontAwesome.ttf
- android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
- android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
- android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
- android/app/src/main/assets/fonts/Foundation.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/Foundation.ttf
- android/app/src/main/assets/fonts/Ionicons.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/Ionicons.ttf
- android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
- android/app/src/main/assets/fonts/MaterialIcons.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/MaterialIcons.ttf
- android/app/src/main/assets/fonts/Octicons.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/Octicons.ttf
- android/app/src/main/assets/fonts/SimpleLineIcons.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/SimpleLineIcons.ttf
- android/app/src/main/assets/fonts/Zocial.ttf 0 additions, 0 deletionsandroid/app/src/main/assets/fonts/Zocial.ttf
- android/app/src/main/java/com/drip/MainApplication.java 7 additions, 3 deletionsandroid/app/src/main/java/com/drip/MainApplication.java
- android/settings.gradle 6 additions, 2 deletionsandroid/settings.gradle
- app.js 21 additions, 9 deletionsapp.js
- components/calendar.js 3 additions, 3 deletionscomponents/calendar.js
Loading
Please register or sign in to comment