Merge branch 'master' of github.uconn.edu:szk11001/cornerstone into s…

…zk11001-master Conflicts: css/widgets-area.php functions.php inc/reg-sidebars.php js/admin-style.js js/navigation.js
jmr06005 · Aug 22, 2014 · 7b12a69 · 7b12a69
1 parent 437ceb7
commit 7b12a69
Show file tree

Hide file tree

Showing 5 changed files with 406 additions and 400 deletions.
diff --git a/css/widgets-area.php b/css/widgets-area.php