Merge remote-tracking branch 'upstream/pull/5378'
[rails.git] / app / views / preferences /
drwxr-xr-x   ..
-rw-r--r-- 20 _update_success_flash.html.erb
-rw-r--r-- 502 edit.html.erb
-rw-r--r-- 782 show.html.erb