zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-05 09:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into refactor-devise-integration

Browse source 
# Conflicts:
#	app/controllers/registrant/contacts_controller.rb
#	config/routes.rb
This commit is contained in:
Artur Beljajev 2018-07-10 18:09:03 +03:00
commit e5cdb2e8db
79 changed files with 804 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/registrant/application.html.erb
View file

@ -65,7 +65,7 @@
</div>
</nav>
<div class="container">
<%= render 'shared/flash' %>
<%= render 'flash_messages' %>
<%= yield %>
</div>
<footer class="footer">