verdnatura-chat/.circleci
Diego Mello a05198548e Merge branch 'new.semantic-colors' into new.semantic-colors-2
# Conflicts:
#	app/containers/ActionSheet/BottomSheetContent.tsx
#	app/containers/ActionSheet/Item.tsx
#	app/containers/EmojiPicker/index.tsx
#	app/containers/MessageActions/Header.tsx
#	app/containers/MessageBox/buttons/BaseButton.tsx
#	app/containers/RoomItem/Touchable.tsx
#	app/containers/ServerItem/index.tsx
#	app/containers/UIKit/DatePicker.tsx
#	app/containers/UIKit/MultiSelect/Chips.tsx
#	app/containers/UIKit/MultiSelect/Input.tsx
#	app/containers/UIKit/MultiSelect/MultiSelectContent.tsx
#	app/containers/UIKit/Overflow.tsx
#	app/containers/UserItem.tsx
#	app/containers/markdown/index.tsx
#	app/containers/message/Audio.tsx
#	app/containers/message/Components/CollapsibleQuote/index.tsx
#	app/containers/message/Image.tsx
#	app/containers/message/Reactions.tsx
#	app/containers/message/Reply.tsx
#	app/containers/message/Urls.tsx
#	app/containers/message/Video.tsx
#	app/lib/constants/colors.ts
#	app/lib/methods/helpers/touch.tsx
#	app/views/AddExistingChannelView.tsx
#	app/views/CreateChannelView.tsx
#	app/views/E2ESaveYourPasswordView.tsx
#	app/views/InviteUsersView/index.tsx
#	app/views/ModalBlockView.tsx
#	app/views/NewMessageView.tsx
#	app/views/NotificationPreferencesView/index.tsx
#	app/views/ReadReceiptView/index.tsx
#	app/views/RegisterView.tsx
#	app/views/RoomInfoView/index.tsx
#	app/views/RoomMembersView/index.tsx
#	app/views/RoomView/Banner.tsx
#	app/views/SelectListView.tsx
#	app/views/SetUsernameView.tsx
#	app/views/ShareListView/Header/SearchBox.tsx
#	app/views/ShareView/Preview.tsx
#	app/views/ShareView/Thumbs.tsx
#	app/views/SidebarView/index.tsx
#	app/views/UserNotificationPreferencesView/index.tsx
#	ios/Podfile.lock
#	ios/RocketChatRN.xcodeproj/project.pbxproj
2022-12-15 16:19:00 -03:00
..
changelog.sh Beta (#265) 2018-04-24 17:08:17 -03:00
config.yml Merge branch 'new.semantic-colors' into new.semantic-colors-2 2022-12-15 16:19:00 -03:00