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

Namespace user #16214

Merged
merged 6 commits into from May 29, 2017
Merged

Namespace user #16214

merged 6 commits into from May 29, 2017

Conversation

laoneo
Copy link
Member

@laoneo laoneo commented May 23, 2017

Namespace user

@laoneo
Use ns'd hash class
93e364f
@laoneo
Merge remote-tracking branch 'remotes/upstream/3.8-dev' into j3/names…
8f624f3 
…pace/user

# Conflicts:
#	libraries/classmap.php
#	libraries/src/Joomla/CMS/User/UserHelper.php
@laoneo
Merge remote-tracking branch 'remotes/upstream/3.8-dev' into j3/names…
ac651aa 
…pace/user

# Conflicts:
#	libraries/classmap.php
#	libraries/src/Joomla/CMS/User/UserHelper.php
@laoneo
Merge remote-tracking branch 'remotes/upstream/3.8-dev' into j3/names…
fde927a 
…pace/user

# Conflicts:
#	libraries/classmap.php
@wilsonge wilsonge merged commit 3e0d863 into joomla:3.8-dev May 29, 2017
@wilsonge wilsonge deleted the j3/namespace/user branch May 29, 2017 09:16
@wilsonge wilsonge added this to the Joomla 3.8.0 milestone May 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Joomla 3.8.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@laoneo @wilsonge @joomla-cms-bot