[Bps-public-commit] rt-extension-assets branch, master, updated. d5b1eb3f62cf1e02c685e515b62b176aaf829b2e

[Alex Vandiver]

The branch, master has been updated
       via  d5b1eb3f62cf1e02c685e515b62b176aaf829b2e (commit)
       via  12bb15ea57bf0bd2dd31e56a41676742fcfb8434 (commit)
       via  26b7e8d50d5551688d435575289546bf952e535b (commit)
       via  625965ad60d40b985c3d37467e3f00c31c6540f1 (commit)
       via  db7dc90a4367a11c77443e430a1f47eac96bd0cd (commit)
       via  83c9423c68d78fac03fca41107c0b1e694616acc (commit)
       via  e7841f96f7f8b5505ce29a47230ced1a0250cbae (commit)
      from  bc295dee97f60dd4f3fdb63249c504d50674d9d9 (commit)

Summary of changes:
 etc/Assets_Config.pm                                         |  6 ++++--
 html/Admin/Assets/index.html                                 |  2 +-
 html/Asset/Elements/ShowRoleMembers                          |  6 +++++-
 html/Callbacks/RT-Extension-Assets/Elements/Tabs/Privileged  | 10 ++++++++--
 html/Callbacks/RT-Extension-Assets/Elements/Tabs/SelfService |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit d5b1eb3f62cf1e02c685e515b62b176aaf829b2e
Merge: bc295de 12bb15e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 26 18:05:30 2013 -0500

    Merge branch '1.0/bug-fixes'


-----------------------------------------------------------------------