5 Commits

Author	SHA1	Message	Date
Galen Wolfe-Pauly	94a3bc7e84	manual merge	2016-01-29 18:54:28 -08:00
Galen Wolfe-Pauly	5e91f7edaf	everything ready to be cleaned.	2016-01-29 18:29:57 -08:00
Anton Dyudin	011f7c0b48	Merge branch 'factor' into ford-ren - XX unresolved js	2016-01-29 17:35:38 -08:00
Anton Dyudin	6fc3c8e5c9	pre-merge: mv urb/zod/urb/zod/{lib,web/lib}/{js,css}	2016-01-29 15:52:28 -08:00
Anton Dyudin	be672cf4e7	pre-merge: mv web/lib/{**.(js|css),\1/}, web/*/{(js|css)/main.\1,main.\1}	2016-01-29 15:50:34 -08:00