diff options
| author | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
| commit | c4221f32738dac51f691d5be1bebd2b50318521e (patch) | |
| tree | e353242b42ca2942d7fe6d29888568c8bfe821ee /mod/impel.php | |
| parent | 6679734135fb04f4a7beccb81663bf1e9574f062 (diff) | |
| parent | 2376d2140ab6eeb8a44d7582a52978520844e229 (diff) | |
| download | volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.gz volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.bz2 volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.zip | |
Merge branch 'master' into tres
Conflicts:
include/notifier.php
Diffstat (limited to 'mod/impel.php')
| -rw-r--r-- | mod/impel.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/impel.php b/mod/impel.php index 4fb9e3ac0..930158589 100644 --- a/mod/impel.php +++ b/mod/impel.php @@ -118,4 +118,4 @@ function impel_init(&$a) { json_return_and_die(true); -}
\ No newline at end of file +} |