Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Holger Lösken 2016-07-13 21:54:25 +00:00
commit 01658c4e46
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/built.js
View File

@ -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*

2
public/js/pdf.pdfmake.js
View File

@ -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*

3
resources/lang/en/texts.php
View File

@ -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',
);