rome2rio
news tags
event tags
article tags
updated routes
updated routes
News show
create news via json
News show
no render on created and order news by date desc
Merge branch 'dev' of github.com:kvakvs/erlanger_ru into dev

Conflicts:
	app/views/news/_column.html.erb
News are now rendered in markdown or html
deleted 1 file
Merge remote-tracking branch 'dmitriid/dev' into dev

Conflicts:
	app/controllers/news_controller.rb
	app/views/news/_column.html.erb
	app/views/news/show.html.erb