Skip to content

Cbp platform last changes#279

Open
lostwood wants to merge 764 commits into
furszy:criticalPathfrom
lostwood:cbp-platform
Open

Cbp platform last changes#279
lostwood wants to merge 764 commits into
furszy:criticalPathfrom
lostwood:cbp-platform

Conversation

@lostwood
Copy link
Copy Markdown

No description provided.

nelsonalfo and others added 30 commits August 3, 2016 21:40
…nto criticalPath

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
…to nindriago-criticalPath

Conflicts:
	CBP/android/sub_app/fermat-cbp-android-sub-app-crypto-broker-identity-bitdubai/src/main/java/com/bitdubai/sub_app/crypto_broker_identity/fragments/CreateCryptoBrokerIdentityFragment.java
	CBP/android/sub_app/fermat-cbp-android-sub-app-crypto-broker-identity-bitdubai/src/main/java/com/bitdubai/sub_app/crypto_broker_identity/fragments/CryptoBrokerIdentityListFragment.java
	CBP/android/sub_app/fermat-cbp-android-sub-app-crypto-broker-identity-bitdubai/src/main/java/com/bitdubai/sub_app/crypto_broker_identity/fragments/EditCryptoBrokerIdentityFragment.java
	CBP/android/sub_app/fermat-cbp-android-sub-app-crypto-customer-identity-bitdubai/src/main/java/com/bitdubai/sub_app/crypto_customer_identity/fragments/CreateAndEditCryptoCustomerIdentityFragment.java
Signed-off-by: Gabriel Araujo <gabe_512@hotmail.com>
danigo252 and others added 30 commits August 8, 2016 23:11
…quest

 and then touch cancel the request is canceled
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.