Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#176: master/detail controller implementation #564

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

#176: master/detail controller implementation #564

wants to merge 2 commits into from

Commits on Sep 10, 2019

  1. bluelinelabs#176: master/detail controller implementation

    @sdelaysam
    sdelaysam committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    28cfa34 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. Merge branch 'develop' into dev/master-detail 

    # Conflicts:
#	conductor/src/main/java/com/bluelinelabs/conductor/Controller.java
#	conductor/src/main/java/com/bluelinelabs/conductor/RouterTransaction.java
#	conductor/src/test/java/com/bluelinelabs/conductor/ControllerLifecycleActivityReferenceTests.java
#	conductor/src/test/java/com/bluelinelabs/conductor/ControllerLifecycleCallbacksTests.java
    @sdelaysam
    sdelaysam committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    9261037 View commit details
    Browse the repository at this point in the history