almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 13:01:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix rebase conflicts

Browse source
This commit is contained in:
Glandos 2021-06-22 21:54:41 +02:00
parent e2e9fe0f52
commit 5076a29f71
2 changed files with 0 additions and 3235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3227
ihatemoney/tests/tests.py
View file

File diff suppressed because it is too large Load diff

8
ihatemoney/translations/pt_BR/LC_MESSAGES/messages.po
View file

@ -817,12 +817,4 @@ msgid "Expenses by Month"
msgstr "Gastos por Mês" msgstr "Gastos por Mês"
msgid "Period" msgid "Period"
<<<<<<< HEAD
msgstr "Período" msgstr "Período"
=======
msgstr ""
<<<<<<< HEAD
>>>>>>> 8c98695 (Add warning in edit project form)
=======
>>>>>>> 74bc2f8 (Revert "Add warning in edit project form")