Skip to content
GitLab
Explore
Sign in
project
select_or_other
Commits
b237162b
Commit
b237162b
authored
Mar 01, 2015
by
Chris Jansen
Browse files
Merge branch '7.x-2.x' into 7.x-3.x
Conflicts: select_or_other.field_widget.inc select_or_other.module
parents
c8429765
aa4fae63
Changes
2
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment