Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.uconn.edu:szk11001/cornerstone into s…
Browse files Browse the repository at this point in the history 
…zk11001-master

Conflicts:
	css/widgets-area.php
	functions.php
	inc/reg-sidebars.php
	js/admin-style.js
	js/navigation.js
  • Loading branch information
andrewmbacon committed Aug 22, 2014
1 parent 437ceb7 commit 7b12a69
Show file tree
Hide file tree
Showing 5 changed files with 406 additions and 400 deletions.
22 changes: 0 additions & 22 deletions css/widgets-area.php
View file

This file was deleted.

Loading

0 comments on commit 7b12a69

Please sign in to comment.