Alexander Machehin ae7de6776d Merge branch '369-remove_codemirror' into 369-bootstrap ... Conflicts: config/environments/production.rb		2014-04-17 13:15:10 +06:00
..
admin	ActiveAdmin integration	2014-04-12 00:29:43 +04:00
assets	Merge branch '369-remove_codemirror' into 369-bootstrap	2014-04-17 13:15:10 +06:00
controllers	Merge branch '369-remove_codemirror' into 369-bootstrap	2014-04-15 19:04:27 +06:00
helpers	Merge branch '369-remove_codemirror' into 369-bootstrap	2014-04-15 19:04:27 +06:00
jobs	Updated comments	2014-04-05 23:20:44 +04:00
mailers	#345: fixed some specs, etc	2014-03-18 00:18:46 +04:00
models	Merge branch '369-remove_codemirror' into 369-bootstrap	2014-04-15 19:04:27 +06:00
presenters	#345: updated gems, views, fixed specs	2014-03-15 01:55:28 +04:00
views	Merge branch '369-remove_codemirror' into 369-bootstrap	2014-04-17 13:15:10 +06:00