Petko Bordjukov c8b9d96f66 Optimize number of conflicts calculation		2016-10-05 15:05:47 +03:00
..
assets	Merge upstream changes	2016-10-01 04:24:46 +03:00
controllers	Export only this year's talk preferences	2016-10-04 14:00:30 +03:00
helpers	Initial rough version	2015-10-06 15:31:06 +03:00
mailers	Initial rough version	2015-10-06 15:31:06 +03:00
models	Optimize number of conflicts calculation	2016-10-05 15:05:47 +03:00
views	Merge with fullnarp's new layout options	2016-10-01 04:21:36 +03:00