Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CakeDC/users
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: OrigamiStructures/users
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 6, 2016

  1. Merge branch '3.1.x' 

    # Conflicts:
#	.semver
#	.travis.yml
#	Config/Migration/001_initialize_users_schema.php
#	Config/Schema/schema.php
#	Locale/deu/LC_MESSAGES/users.mo
#	Locale/deu/LC_MESSAGES/users.po
#	Locale/fra/LC_MESSAGES/users.po
#	Locale/users.pot
#	Model/User.php
#	README.md
#	Test/Case/Model/UserTest.php
    @curlyjason
    curlyjason committed Jan 6, 2016
    Configuration menu
    Copy the full SHA
    b22d61b View commit details
    Browse the repository at this point in the history
Loading