Scott Erickson 2855d2a402 Made the deltas lib conflict identifying library able to handle many-to-many conflicts. ... Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.		2014-07-03 17:41:58 -07:00
..
fixtures	Fixed #1111.	2014-06-06 16:47:48 -07:00
lib	Made the deltas lib conflict identifying library able to handle many-to-many conflicts.	2014-07-03 17:41:58 -07:00
models	Working on User patching.	2014-06-11 13:16:17 -07:00
views	Maybe fixing the toggleModal system once and for all.	2014-06-18 12:04:38 -04:00