Commit Graph

4 Commits

Author SHA1 Message Date
Andrew Brown
3fd6d604fe Revert "Revert "Resolve merge with master""
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
2015-03-13 22:46:31 -05:00
Robert Richter
6f8ae925ba Revert "Resolve merge with master"
This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing
changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.
2015-03-13 20:18:49 -05:00
Andrew Brown
5c39cbb4aa Hook up pickers to edit forms 2014-07-28 21:42:40 -05:00
Andrew Brown
af5f0276c1 javascript refactoring 2014-03-02 01:52:25 +00:00