developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 

Conflicts:
	Gemfile.lock
	app/controllers/admin/pages_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
This commit is contained in:
Christophe Vilayphiou 2012-02-27 18:56:15 +08:00
parent 0029ef2b5a 70b4c83cf5
commit fe4c0986e7
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendored
View File

@ -141,7 +141,6 @@
}); });
</script> </script>
<% end %> <% end %>
<<<<<<< HEAD
<!--Widget start--> <!--Widget start-->
<!-- <div id="sub-wiget"> <!-- <div id="sub-wiget">
@ -530,5 +529,3 @@
<button class="btn btn-primary" type="submit">Submit/送出</button> <button class="btn btn-primary" type="submit">Submit/送出</button>
<button class="btn" type="reset">Cancel/取消</button> <button class="btn" type="reset">Cancel/取消</button>
<!-- </div> --> <!-- </div> -->
=======
>>>>>>> Fix bugs and changes for nccu