Skip to content
Find file Blame History Permalink
  • jbuechele's avatar
    Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.ReactNative into ios-changes · 6e09ed1a
    jbuechele authored 
    # Conflicts:
#	README.md
#	android/app/build.gradle
#	android/app/src/main/res/drawable-hdpi/launch_screen.png
#	android/app/src/main/res/drawable-mdpi/launch_screen.png
#	android/app/src/main/res/drawable-xhdpi/launch_screen.png
#	android/app/src/main/res/drawable-xxhdpi/launch_screen.png
#	android/app/src/main/res/drawable-xxxhdpi/launch_screen.png
#	android/app/src/main/res/values/colors.xml
#	app/constants/links.js
#	app/i18n/locales/de.js
#	app/lib/database/index.js
#	app/views/LoginSignupView.js
#	app/views/OnboardingView/index.js
#	app/views/OnboardingView/styles.js
#	ios/Podfile.lock
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/Target Support Files/react-native-splash-screen/react-native-splash-screen.xcconfig
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	yarn.lock
    6e09ed1a
To learn more about this project, read the wiki.

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net