Alexander Machehin 692ffa9dc4 Merge branch 'master' into 369-bootstrap ... Conflicts: app/controllers/application_controller.rb		2015-02-02 23:38:48 +05:00
..
api/v1	#446: cleanup, added specs for Project#fork	2015-01-14 23:56:26 +03:00
groups	#369: remove layouts/application.html.haml	2014-11-14 00:41:07 +03:00
platforms	#369: remove layouts/application.html.haml	2014-11-14 00:41:07 +03:00
projects	[#369] fix double render	2015-02-02 23:21:28 +05:00
users	#369: remove layouts/application.html.haml	2014-11-14 00:41:07 +03:00
advisories_controller.rb	#369: remove layouts/application.html.haml	2014-11-14 00:41:07 +03:00
application_controller.rb	Merge branch 'master' into 369-bootstrap	2015-02-02 23:38:48 +05:00
autocompletes_controller.rb	#369: updated UI for Groups::Members	2014-11-12 02:50:15 +03:00
contacts_controller.rb	#29: removed hack for encoding	2013-03-18 15:36:16 +04:00
home_controller.rb	#369: updated UI for tour	2014-11-14 02:48:45 +03:00
pages_controller.rb	#369: updated UI for tour	2014-11-14 02:48:45 +03:00
search_controller.rb	#369: updated UI for search	2014-11-18 00:17:03 +03:00
sitemap_controller.rb	#370: generate sitemap	2014-03-29 02:14:37 +04:00
statistics_controller.rb	#369: remove layouts/application.html.haml	2014-11-14 00:41:07 +03:00