harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php
This commit is contained in:
redmatrix
2015-07-19 21:08:34 -07:00
parent fd8e6f3130 736db4992b
commit 15b6e8faa4
6 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/identity.php
View File

@@ -630,7 +630,6 @@ function identity_export_year($channel_id,$year) {
}
/**
* @brief Loads a profile into the App structure.
*