mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-08 20:22:42 +01:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
01658c4e46
@ -31773,8 +31773,6 @@ NINJA.processItem = function(item, section) {
|
||||
|
||||
NINJA.parseMarkdownText = function(val, groupText)
|
||||
{
|
||||
val = val + "\n";
|
||||
|
||||
var rules = [
|
||||
['\\\*\\\*(\\\w.+?)\\\*\\\*', {'bold': true}], // **value**
|
||||
['\\\*(\\\w.+?)\\\*', {'italics': true}], // *value*
|
||||
|
@ -737,8 +737,6 @@ NINJA.processItem = function(item, section) {
|
||||
|
||||
NINJA.parseMarkdownText = function(val, groupText)
|
||||
{
|
||||
val = val + "\n";
|
||||
|
||||
var rules = [
|
||||
['\\\*\\\*(\\\w.+?)\\\*\\\*', {'bold': true}], // **value**
|
||||
['\\\*(\\\w.+?)\\\*', {'italics': true}], // *value*
|
||||
|
@ -2027,7 +2027,8 @@ $LANG = array(
|
||||
'restored_expense_category' => 'Successfully restored expense category',
|
||||
'apply_taxes' => 'Apply taxes',
|
||||
'min_to_max_users' => ':min to :max users',
|
||||
'max_users_reached' => 'The maximum number of users has been reached.'
|
||||
'max_users_reached' => 'The maximum number of users has been reached.',
|
||||
'dwolla' => 'Dwolla',
|
||||
|
||||
);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user