nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Raphael 2010-10-07 15:02:37 -07:00
commit 6dbe429ed1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/dev_utilities_controller.rb
View file

@ -3,7 +3,7 @@
# the COPYRIGHT file.
class DevUtilitiesController < ApplicationController
before_filter :authenticate_user!, :except => [:set_backer_number]
before_filter :authenticate_user!, :except => [:set_backer_number, :log]
include ApplicationHelper
include RequestsHelper

2
config/locales/devise/devise.nb.yml
View file

@ -2,7 +2,7 @@
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
no_NO:
nb:
errors:
messages:
not_found: "ble ikke funnet"

2
config/locales/diaspora/nb.yml
View file

@ -5,7 +5,7 @@
# Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
en:
nb:
hello: "Hallo, verden!"
application:
helper: