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

[Alex Vandiver]

The branch, master has been updated
       via  0e86af3db0db0d8adfbaaf3517ae58d71fd09d14 (commit)
       via  0975a056534a0ef3e9a1e56ec5ce69569389475f (commit)
      from  6125261bed1803f64e2831c220ff48878e509511 (commit)

Summary of changes:
 html/Asset/Create.html       | 3 +++
 html/Asset/Display.html      | 2 ++
 html/Asset/History.html      | 2 ++
 html/Asset/Modify.html       | 2 ++
 html/Asset/ModifyCFs.html    | 2 ++
 html/Asset/ModifyDates.html  | 2 ++
 html/Asset/ModifyLinks.html  | 2 ++
 html/Asset/ModifyPeople.html | 2 ++
 8 files changed, 17 insertions(+)

- Log -----------------------------------------------------------------
commit 0e86af3db0db0d8adfbaaf3517ae58d71fd09d14
Merge: 6125261 0975a05
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jan 27 17:18:40 2014 -0500

    Merge branch '1.0/add-catalog-css-class'
    
    Conflicts:
    	html/Asset/Create.html


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