• Tim Felgentreff's avatar
    Merge remote branch 'edavis/master' into master-journalized · 19c7dc00
    Tim Felgentreff authored
    Conflicts:
    	app/controllers/application_controller.rb
    	app/controllers/wiki_controller.rb
    	app/helpers/issues_helper.rb
    	app/models/time_entry.rb
    	app/models/wiki_content.rb
    	app/views/wiki/edit.rhtml
    	config/locales/ja.yml
    	test/functional/wiki_controller_test.rb
    19c7dc00
Name
Last commit
Last update
..
bg.yml Loading commit data...
bs.yml Loading commit data...
ca.yml Loading commit data...
cs.yml Loading commit data...
da.yml Loading commit data...
de.yml Loading commit data...
el.yml Loading commit data...
en-GB.yml Loading commit data...
en.yml Loading commit data...
es.yml Loading commit data...
eu.yml Loading commit data...
fi.yml Loading commit data...
fr.yml Loading commit data...
gl.yml Loading commit data...
he.yml Loading commit data...
hr.yml Loading commit data...
hu.yml Loading commit data...
id.yml Loading commit data...
it.yml Loading commit data...
ja.yml Loading commit data...
ko.yml Loading commit data...
lt.yml Loading commit data...
lv.yml Loading commit data...
mk.yml Loading commit data...
mn.yml Loading commit data...
nl.yml Loading commit data...
no.yml Loading commit data...
pl.yml Loading commit data...
pt-BR.yml Loading commit data...
pt.yml Loading commit data...
ro.yml Loading commit data...
ru.yml Loading commit data...
sk.yml Loading commit data...
sl.yml Loading commit data...
sr-YU.yml Loading commit data...
sr.yml Loading commit data...
sv.yml Loading commit data...
th.yml Loading commit data...
tr.yml Loading commit data...
uk.yml Loading commit data...
vi.yml Loading commit data...
zh-TW.yml Loading commit data...
zh.yml Loading commit data...