projects
/
WP-Plugins
/
glm-member-db-packaging.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1210262
b76d014
)
Merge branch 'feature/FixAddPackageButton' into develop
author
Chuck Scott
<cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:59:29 +0000
(11:59 -0500)
committer
Chuck Scott
<cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:59:29 +0000
(11:59 -0500)
Conflicts:
views/admin/members/packaging.html
Trivial merge