Merge remote-tracking branch 'remotes/origin/master'

Conflicts: app/controllers/config_controller.rb app/views/config/index.html.erb config/routes.rb
2013-02-17 15:57:05 +01:00
parent 5b8b419fa1 6acd562297
commit f17b269458
3 changed files with 7 additions and 0 deletions
--- a/app/views/config/index.html.erb
+++ b/app/views/config/index.html.erb
@@ -5,6 +5,7 @@
 </li>
 </ul>
 <%= link_to 'Update',config_getgitupdate_url %>
+<%= link_to 'Update',:controller =>"config",:action => "get_git_update" %>