Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dschoenbauer/dot-notation into re…
Browse files Browse the repository at this point in the history
…lease

Conflicts:
	docs/class-DSchoenbauer.DotNotation.ArrayDotNotation.html
	docs/class-DSchoenbauer.DotNotation.Enum.ExceptionMessage.html
	docs/class-DSchoenbauer.DotNotation.Exception.ExceptionInterface.html
	docs/class-DSchoenbauer.DotNotation.Exception.InvalidArgumentException.html
	docs/class-DSchoenbauer.DotNotation.Exception.PathNotArrayException.html
	docs/class-DSchoenbauer.DotNotation.Exception.PathNotFoundException.html
	docs/class-DSchoenbauer.DotNotation.Exception.TargetNotArrayException.html
	docs/class-DSchoenbauer.DotNotation.Exception.UnexpectedValueException.html
	docs/namespace-DSchoenbauer.DotNotation.Exception.html
	docs/source-class-DSchoenbauer.DotNotation.ArrayDotNotation.html
	docs/source-class-DSchoenbauer.DotNotation.Enum.ExceptionMessage.html
	docs/source-class-DSchoenbauer.DotNotation.Exception.ExceptionInterface.html
	docs/source-class-DSchoenbauer.DotNotation.Exception.InvalidArgumentException.html
	docs/source-class-DSchoenbauer.DotNotation.Exception.PathNotArrayException.html
	docs/source-class-DSchoenbauer.DotNotation.Exception.PathNotFoundException.html
	docs/source-class-DSchoenbauer.DotNotation.Exception.TargetNotArrayException.html
	docs/source-class-DSchoenbauer.DotNotation.Exception.UnexpectedValueException.html
	src/DotNotation/ArrayDotNotation.php
	src/DotNotation/Enum/ExceptionMessage.php
	src/DotNotation/Exception/ExceptionInterface.php
	src/DotNotation/Exception/InvalidArgumentException.php
	src/DotNotation/Exception/PathNotArrayException.php
	src/DotNotation/Exception/PathNotFoundException.php
	src/DotNotation/Exception/TargetNotArrayException.php
	src/DotNotation/Exception/UnexpectedValueException.php
  • Loading branch information
David Schoenbauer committed Dec 2, 2016
2 parents 28bfefb + 3fbc97f commit afb2bfe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ $configDump = $config->getData();
'title' => 'Dot Notation'
];
*/
````
````

0 comments on commit afb2bfe

Please sign in to comment.