Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/nav/_profile.html.haml		2014-12-25 18:48:15 +02:00
..
admin	…
dashboard	…
explore	Fix spinach tests	2014-12-24 14:34:37 +02:00
profile	Fix tests and add message if no oauth apps	2014-12-25 18:46:19 +02:00
project	Merge branch 'upstream-master' into markdown-preview	2014-12-07 20:25:58 -07:00
snippets	Fix raw view for public snippets	2014-10-27 11:51:31 +02:00
steps	Merge branch 'master' into oauth2_provider	2014-12-25 18:48:15 +02:00
support	…
groups.feature	…
search.feature	…
snippet_search.feature	…
user.feature	…