Skip to content
Snippets Groups Projects
Commit 3a9fb378 authored by potreb's avatar potreb
Browse files

Merge remote-tracking branch 'origin/feature/strong-typing' into feature/strong-typing 

# Conflicts:
#	changelog.txt
#	src/Field.php
#	src/Field/BasicField.php
#	src/Field/NoValueField.php
#	src/Field/ProductSelect.php
#	src/Field/TimepickerField.php
#	src/Persistence/FieldPersistenceStrategy.php
#	src/Serializer/NoSerialize.php
#	templates/header.php
#	templates/input-image.php
parents deee9690 679dcfd9
No related branches found
No related tags found
3 merge requests!28release: 3.0.0,!23Feature/strong typing pp,!19Add strong typing for 3.0 version
Show whitespace changes
Inline Side-by-side
Showing
with 98 additions and 95 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment