|
Matt Friedman <maf675@gmail.com>
|
ca11e1b28778f3cc882f0aad48ec5394c583872a
ca11e1b28778f3cc882f0aad48ec5394c583872a |
Merge pull request #270 from phpbb/3.3.x
Merge 3.3.x into Master |
|
|
Matt Friedman <maf675@gmail.com>
|
37ad317628c8bb4aeb9c0b2a66cdd7434ef90eb1
m 37ad317628c8bb4aeb9c0b2a66cdd7434ef90eb1 |
Merge pull request #269 from iMattPro/permissions
Rework the permissions systems documentation in extensions |
|
|
Matt Friedman <maf675@gmail.com>
|
2e438cdec8f552a861e6ef121dba34a3d3f65367
m 2e438cdec8f552a861e6ef121dba34a3d3f65367 |
Merge branch '3.3.x' into permissions
Signed-off-by: Matt Friedman <maf675@gmail.com>
# Conflicts:
# development/extensions/index.rst |
|
|
Matt Friedman <maf675@gmail.com>
|
73d9bbb714f35fcf4a9dd214726307289702e4ff
m 73d9bbb714f35fcf4a9dd214726307289702e4ff |
Merge pull request #268 from iMattPro/databasetypes
Add Database Types Map |
|
|
Matt Friedman <maf675@gmail.com>
|
7ed7c83eb807683f92a43ba77e62c569e074381d
m 7ed7c83eb807683f92a43ba77e62c569e074381d |
Merge pull request #267 from iMattPro/updates2
Use Twig for extension templating documentation |
|