Skip to content
This repository has been archived by the owner. It is now read-only.

do not call get translation with fallback locale and fallback enabled #502

Merged
merged 5 commits into from Jul 25, 2018

Conversation

@Gummibeer
Copy link
Collaborator

commented Jul 24, 2018

replaces: #468 by @Gummibeer
solves:

Gummibeer added some commits May 14, 2018

Merge pull request #468 from Gummibeer/patch-8
do not call get translation with fallback locale and fallback enabled

@Gummibeer Gummibeer self-assigned this Jul 24, 2018

@dimsav

This comment has been minimized.

Copy link
Owner

commented Jul 24, 2018

@Gummibeer please fix the conflicts and feel free to merge.

Merge remote-tracking branch 'remotes/origin/master' into pr-468
# Conflicts:
#	src/Translatable/Translatable.php

@Gummibeer Gummibeer merged commit 751daeb into master Jul 25, 2018

3 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/styleci/pr The analysis has passed
Details
continuous-integration/styleci/push The analysis has passed
Details

@Gummibeer Gummibeer deleted the pr-468 branch Jul 25, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
2 participants
You can’t perform that action at this time.