projects
/
WP-Plugins
/
glm-blocks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2a51e8d
f0439f9
)
Merge tag 'v1.5.4' into develop
author
Steve Sutton
<steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:30 +0000
(14:12 -0500)
committer
Steve Sutton
<steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:30 +0000
(14:12 -0500)
Version 1.5.4
1
2
models/block.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
models/block.php
Simple merge