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

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

Browse Source 
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-10-12 18:17:05 +08:00
2 parents 1ce7f00084 189fa553c5
commit b5571dbc43
894 files changed
+23695 -2108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/locales/en.yml
+1
View File
@@ -130,6 +130,7 @@ en:
attributes: Attributes
author: Author
calendar: Calendar
gprs: GPRS
cant_delete_self: You can not delete yourself.
cant_revoke_self_admin: You can not revoke your admin role yourself.
category: Category